Changeset 25270 for main/trunk

Timestamp:

2012-03-23T15:42:22+13:00 (12 years ago)

Author:

sjm84

Message:

Removed the emailing code

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -18 +18 @@
 import java.io.File;
 
-import javax.mail.Message;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
 import net.tanesha.recaptcha.ReCaptchaImpl;
 import net.tanesha.recaptcha.ReCaptchaResponse;
@@ -48 +41 @@
     protected static final int ERROR_CAPTCHA_MISSING = -15;
     protected static final int ERROR_NOT_AUTHORISED = -16;
-    protected static final int ERROR_COULD_NOT_RESET_PASSWORD = -17;
 
     protected static final HashMap<Integer, String> _errorMessageMap;
@@ -71 +63 @@
         errorMessageMap.put(ERROR_CAPTCHA_MISSING, "The information from the captcha is missing.");
         errorMessageMap.put(ERROR_NOT_AUTHORISED, "You are not authorised to access this page.");
-        errorMessageMap.put(ERROR_COULD_NOT_RESET_PASSWORD, "Your password could not be reset, your email address may be invalid.");
 
         _errorMessageMap = errorMessageMap;
@@ -542 +533 @@
             String host = request.getAttribute("remoteAddress");
             
-            Properties props = System.getProperties();
-            props.setProperty("mail.smtp.host", host);
-            
-            Session session = Session.getDefaultInstance(props);
-            
-            try
-            {
-                MimeMessage message = new MimeMessage(session);
-                message.setFrom(new InternetAddress(from));
-                message.addRecipient(Message.RecipientType.TO, new InternetAddress(email));
-                message.setSubject("Password reset");
-                message.setText("Your password was reset to " + newPassword);
-                
-                Transport.send(message);
-            }
-            catch(Exception ex)
-            {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_COULD_NOT_RESET_PASSWORD));
-                serviceNode.setAttribute("operation", ACCOUNT_SETTINGS);
-                ex.printStackTrace();
-                return result;
-            }
-            
-            System.err.println("MAIL SUCCESS");
+            //TODO: FINISH THIS
         }
         else if (op.equals(PERFORM_DELETE_USER))