[cvs] eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj ForumMessage.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv14177/src/WEB-INF/src/com/jcorporate/eforum/dbobj

Modified Files:
	ForumMessage.java 
Log Message:
only send emails if the user is Active (in case the user is set to Disabled)


Index: ForumMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ForumMessage.java	10 May 2004 05:15:15 -0000	1.13
--- ForumMessage.java	12 May 2004 22:16:32 -0000	1.14
***************
*** 17,20 ****
--- 17,23 ----
  // History
  //	$Log$
+ //	Revision 1.14  2004/05/12 22:16:32  mtraum
+ //	only send emails if the user is Active (in case the user is set to Disabled)
+ //	
  //	Revision 1.13  2004/05/10 05:15:15  dlloyd
  //	unknown user could break email
***************
*** 391,399 ****
  
                      UserInfo userInfo = u.getUserInfo();
!                     if (! (User.ACTIVE_ACCOUNT_STATUS.equals(userInfo.getAccountStatus()))) {
!                         log.info("User: " + userInfo.getUid() + "(" + userInfo.getLoginName()
!                                  + ") doesn't have active account status (" 
!                                  + userInfo.getAccountStatus());
!                     }
  		} catch (DBException dbe) {
                          log.info("User: " + oneSubscribe.getFieldInt(ForumSubscribe.FLD_UID) 
--- 394,398 ----
  
                      UserInfo userInfo = u.getUserInfo();
! 
  		} catch (DBException dbe) {
                          log.info("User: " + oneSubscribe.getFieldInt(ForumSubscribe.FLD_UID) 
***************
*** 401,412 ****
                  }
  
! 		// Add an entry into the event handler to post
! 		// electronic mail. The event handler will notify
! 		// known users with the text message. The Event
! 		// Handler has been extended to support MIME part
! 		// attachments.
!                 if ( u != null )
!                     EventHandler.notify( dataContext, oneSubscribe.getFieldInt(FLD_EXP_UID),
!                                          msgSubject, message, attachments );
              }
  
--- 400,420 ----
                  }
  
! 
! 				if (userInfo != null && User.ACTIVE_ACCOUNT_STATUS.equals(userInfo.getAccountStatus())) {
! 	                if ( u != null ) {
! 						// Add an entry into the event handler to post
! 						// electronic mail. The event handler will notify
! 						// known users with the text message. The Event
! 						// Handler has been extended to support MIME part
! 						// attachments.
! 	                    EventHandler.notify( dataContext, oneSubscribe.getFieldInt(FLD_EXP_UID),
! 	                                         msgSubject, message, attachments );
! 	                }
! 				}
! 				else {
! 					log.info("User: " + userInfo.getUid() + "(" + userInfo.getLoginName()
! 							 + ") doesn't have active account status (" 
! 							 + userInfo.getAccountStatus());
! 				}
              }