[Mrpostman-cvs] mrpostman/src/org/mrbook/mrpostman/pop PopConnection.java,1.14,1.15

[<chr...@us...>]

Update of /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/pop
In directory sc8-pr-cvs1:/tmp/cvs-serv31978

Modified Files:
	PopConnection.java 
Log Message:
Fixed extension message

Index: PopConnection.java
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/pop/PopConnection.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PopConnection.java	24 Apr 2003 22:30:33 -0000	1.14
--- PopConnection.java	22 Nov 2003 14:58:10 -0000	1.15
***************
*** 74,77 ****
--- 74,78 ----
      private String login;
      private String password;
+     private String usernameExtension;
      private WebMailSession wms = null;
      protected Socket client;
***************
*** 158,165 ****
              Matcher matcher = userPat.matcher(line);
              matcher.find();
-             sendOk("user " + matcher.group(1) + " accepted");
              login = new String(matcher.group(1));
!             have_username = true;
!             return false;
              /* PASS */
          } else if (passPat.matcher(line).find()) {
--- 159,175 ----
              Matcher matcher = userPat.matcher(line);
              matcher.find();
              login = new String(matcher.group(1));
!             Matcher extmatcher = userExtensionPat.matcher(login);
!             if (extmatcher.find()) {
!                 usernameExtension = new String(extmatcher.group(1));
!                 logger.fine("Extension: " + usernameExtension);
!                 sendOk("user " + matcher.group(1) + " accepted");
!             //login = new String(matcher.group(1));
!                 have_username = true;
!                 return false;
!             } else {
!                 sendErr("please provide complete email address for username e.g. us...@ho... or us...@ya...");
!                 return false;
!             }
              /* PASS */
          } else if (passPat.matcher(line).find()) {
***************
*** 168,179 ****
                  return false;
              }
!             Matcher extmatcher = userExtensionPat.matcher(login);
!             extmatcher.find();
!             String usernameExtension = new String(extmatcher.group(1));
!             logger.fine("Extension: " + usernameExtension);
              Matcher matcher = passPat.matcher(line);
              matcher.find();
              password = new String(matcher.group(1));
!             logger.info("Found extension: " + usernameExtension);
              wms = MrPostman.getMainInstance().getModuleHandlerForExtension(usernameExtension);
  
--- 178,189 ----
                  return false;
              }
!             //Matcher extmatcher = userExtensionPat.matcher(login);
!             //if (extmatcher.find()) {
!             //    String usernameExtension = new String(extmatcher.group(1));
!             //    logger.fine("Extension: " + usernameExtension);
              Matcher matcher = passPat.matcher(line);
              matcher.find();
              password = new String(matcher.group(1));
!             //logger.info("Found extension: " + usernameExtension);
              wms = MrPostman.getMainInstance().getModuleHandlerForExtension(usernameExtension);