Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailForm.java =================================================================== diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -r542a745973c9ce7a92eef7329a96c1ac6d028256 --- lams_central/src/java/org/lamsfoundation/lams/web/EmailForm.java (.../EmailForm.java) (revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc) +++ lams_central/src/java/org/lamsfoundation/lams/web/EmailForm.java (.../EmailForm.java) (revision 542a745973c9ce7a92eef7329a96c1ac6d028256) @@ -39,6 +39,7 @@ private Long userId; private String to; + private String ccEmail; private String subject; private String body; @@ -57,6 +58,14 @@ public void setTo(String name) { this.to = name; } + + public void setCcEmail(String ccEmail) { + this.ccEmail = ccEmail; + } + + public String getCcEmail() { + return ccEmail; + } public String getSubject() { return subject; Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java =================================================================== diff -u -r67dfbf3258ae491f495d918b8c397819ffed018f -r542a745973c9ce7a92eef7329a96c1ac6d028256 --- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java (.../EmailUserAction.java) (revision 67dfbf3258ae491f495d918b8c397819ffed018f) +++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java (.../EmailUserAction.java) (revision 542a745973c9ce7a92eef7329a96c1ac6d028256) @@ -41,7 +41,9 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.CentralConstants; +import org.lamsfoundation.lams.util.Emailer; import org.lamsfoundation.lams.util.MessageService; +import org.lamsfoundation.lams.util.ValidationUtil; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; @@ -106,8 +108,19 @@ + " sent email to user ID " + userId + ": \n[subject] " + subject + "\n[message] " + body); } + boolean IS_HTML_FORMAT = false; getEventNotificationService().sendMessage(currentUser.getUserID(), userId.intValue(), - IEventNotificationService.DELIVERY_METHOD_MAIL, subject, body, false); + IEventNotificationService.DELIVERY_METHOD_MAIL, subject, body, IS_HTML_FORMAT); + + String ccEmail = emailForm.getCcEmail(); + if (StringUtils.isNotBlank(ccEmail) && ValidationUtil.isEmailValid(ccEmail, false)) { + Emailer.sendFromSupportEmail(subject, ccEmail, body, IS_HTML_FORMAT); + + if (EmailUserAction.log.isDebugEnabled()) { + EmailUserAction.log.debug("User " + currentUser.getLogin() + " (" + currentUser.getEmail() + ") " + + " sent email to user ID " + userId + ": \n[subject] " + subject + "\n[message] " + body); + } + } return null; } Index: lams_central/web/emailuser.jsp =================================================================== diff -u -r738c1ec90176394b826038af57ed7afeab3c76d5 -r542a745973c9ce7a92eef7329a96c1ac6d028256 --- lams_central/web/emailuser.jsp (.../emailuser.jsp) (revision 738c1ec90176394b826038af57ed7afeab3c76d5) +++ lams_central/web/emailuser.jsp (.../emailuser.jsp) (revision 542a745973c9ce7a92eef7329a96c1ac6d028256) @@ -20,17 +20,38 @@ input, textarea { width: 100%; - } + } + + input[type="checkbox"] { + width: 10px; + vertical-align: bottom; + margin-top: 5px; + } + + #cc-email-area { + display: none; + } - + +
@@ -78,15 +113,39 @@ +
+ |
+
||
+ + + | +
+
+
+ |
+ |