X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/5d851d7c1a630286a5a7386f70db4ab0424029c8..e84aceccd570655fbd36593ca20302456e1b501a:/support.sml

diff --git a/support.sml b/support.sml
index 701737b..48a818d 100644
--- a/support.sml
+++ b/support.sml
@@ -261,7 +261,9 @@ fun writeRecipients (mail, iss : issue, cat : category, noName) =
 		  FROM WebUser JOIN Membership ON (usr = id AND grp = ^(C.intToSql (#grp cat)))`
 	    else
 		$`SELECT name
-		  FROM WebUser JOIN SupSubscription ON (usr = id AND cat = ^(C.intToSql (#id cat)))`
+		  FROM WebUser JOIN SupSubscription ON (usr = id AND cat = ^(C.intToSql (#id cat)))
+		  UNION SELECT name
+		  FROM WebUser JOIN Membership ON (usr = id AND grp = ^(C.intToSql (#grp cat)))`
 
 	fun doOne [name] =
 	    let
@@ -271,6 +273,7 @@ fun writeRecipients (mail, iss : issue, cat : category, noName) =
 		    ()
 		else
 		    (Mail.mwrite (mail, name);
+		     Mail.mwrite (mail, emailSuffix);
 		     Mail.mwrite (mail, ","))
 	    end
     in
@@ -287,9 +290,12 @@ fun notify (prefix, f) iss =
 
 	val mail = Mail.mopen ()
     in
-	Mail.mwrite (mail, "From: Hcoop Support System <support@hcoop.net>\nTo: ");
+	Mail.mwrite (mail, "From: Hcoop Support System <support");
+	Mail.mwrite (mail, emailSuffix);
+	Mail.mwrite (mail, ">\nTo: ");
 	Mail.mwrite (mail, #name user);
-	Mail.mwrite (mail, "@hcoop.net\n");
+	Mail.mwrite (mail, emailSuffix);
+	Mail.mwrite (mail, "\n");
 	writeRecipients (mail, iss, cat, #name user);
 	Mail.mwrite (mail, "Subject: ");
 	Mail.mwrite (mail, prefix);
@@ -345,7 +351,7 @@ fun notifyStatus (usr, oldStatus, newStatus, iss) =
 	val user = Init.lookupUser usr
     in
 	notify ("[" ^ statusToString newStatus ^ "] ",
-		fn (iss, cat, user, mail) =>
+		fn (iss, cat, user', mail) =>
 		   (Mail.mwrite (mail, #name user);
 		    Mail.mwrite (mail, " changed status from ");
 		    Mail.mwrite (mail, statusToString oldStatus);
@@ -354,4 +360,4 @@ fun notifyStatus (usr, oldStatus, newStatus, iss) =
 		    Mail.mwrite (mail, ".\n"))) iss
     end
 	       
-end
\ No newline at end of file
+end