--- projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/EMail__Alerter.java	2001/03/02 00:14:12	1.3
+++ projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/EMail__Alerter.java	2001/03/02 00:37:03	1.4
@@ -14,7 +14,7 @@ import java.io.*;
  * This Alert sends by e-mail.
  *
  * @author  $Author: tdb $
- * @version $Id: EMail__Alerter.java,v 1.3 2001/03/02 00:14:12 tdb Exp $
+ * @version $Id: EMail__Alerter.java,v 1.4 2001/03/02 00:37:03 tdb Exp $
  */
 public class EMail__Alerter implements PluginAlerter {
 
@@ -23,7 +23,7 @@ public class EMail__Alerter implements PluginAlerter {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.3 $";
+    public final String REVISION = "$Revision: 1.4 $";
     
     public final String DESC = "Sends alerts by e-mail";
     
@@ -58,6 +58,7 @@ public class EMail__Alerter implements PluginAlerter {
             // sort out the subject
             String subject = _subject;
             subject = StringUtils.replaceText(subject, "%level%", String.valueOf(alert.getLevel()));
+            subject = StringUtils.replaceText(subject, "%source%", alert.getSource());
             subject = StringUtils.replaceText(subject, "%value%", alert.getValue());
             subject = StringUtils.replaceText(subject, "%thresholdValue%", alert.getThresholdValue());
             subject = StringUtils.replaceText(subject, "%attributeName%", alert.getAttributeName());
@@ -65,6 +66,7 @@ public class EMail__Alerter implements PluginAlerter {
             // sort out the message body
             String message = _message;
             message = StringUtils.replaceText(message, "%level%", String.valueOf(alert.getLevel()));
+            message = StringUtils.replaceText(message, "%source%", alert.getSource());
             message = StringUtils.replaceText(message, "%value%", alert.getValue());
             message = StringUtils.replaceText(message, "%thresholdValue%", alert.getThresholdValue());
             message = StringUtils.replaceText(message, "%attributeName%", alert.getAttributeName());