From a1d560a878d1dfe4ed751cb3f99b1ee67755f489 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Sun, 6 Dec 2009 12:20:08 +0200
Subject: Allow to specify arbitrary notification recipients.

* src/wydawca.h (enum notification_target): New value notify_read,
meaning "read recipient addresses from the message headers".
* src/config.c (target_args): New values: "read" and "message".
(target_types): New value 'notify_read'.
* src/mail.c (mail_send_message): Handle NULL rcpt.
(do_notify): Handle notify_read.
---
 src/config.c  |  4 ++++
 src/mail.c    | 57 +++++++++++++++++++++++++++++++++++----------------------
 src/vtab.c    |  2 +-
 src/wydawca.h |  1 +
 4 files changed, 41 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/config.c b/src/config.c
index c877c26..559f766 100644
--- a/src/config.c
+++ b/src/config.c
@@ -182,6 +182,8 @@ string_to_notification_event (grecs_locus_t *locus, const char *val,
 }
 
 static const char *target_args[] = {
+  "read",
+  "message",
   "admin",
   "owner",
   "user",
@@ -189,6 +191,8 @@ static const char *target_args[] = {
 };
 
 static int target_types[] = {
+  notify_read,         /* Read recipients from the message headers */
+  notify_read,
   notify_admin,        /* System administrator */
   notify_owner,        /* Project admin */
   notify_user          /* User (uploader) */
diff --git a/src/mail.c b/src/mail.c
index a40e4b4..91ea502 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -64,22 +64,25 @@ mail_send_message (mu_address_t rcpt, const char *text)
   mu_message_get_header (msg, &hdr);
   mu_header_append (hdr, "X-Mailer", x_mailer);
 
-  mu_address_to_string (rcpt, NULL, 0, &size);
-  buf = xmalloc (size + 1);
-  mu_address_to_string (rcpt, buf, size + 1, NULL);
-
-  mu_header_set_value (hdr, "To", buf, 1);
-  free (buf);
-
-  if (from_address && mu_header_sget_value (hdr, "From", &sval))
+  if (rcpt)
     {
-      mu_address_to_string (from_address, NULL, 0, &size);
+      mu_address_to_string (rcpt, NULL, 0, &size);
       buf = xmalloc (size + 1);
-      mu_address_to_string (from_address, buf, size + 1, NULL);
-      mu_header_set_value (hdr, "From", buf, 1);
+      mu_address_to_string (rcpt, buf, size + 1, NULL);
+
+      mu_header_set_value (hdr, "To", buf, 1);
       free (buf);
-    }
 
+      if (from_address && mu_header_sget_value (hdr, "From", &sval))
+	{
+	  mu_address_to_string (from_address, NULL, 0, &size);
+	  buf = xmalloc (size + 1);
+	  mu_address_to_string (from_address, buf, size + 1, NULL);
+	  mu_header_set_value (hdr, "From", buf, 1);
+	  free (buf);
+	}
+    }
+  
   if (debug_level > 1)
     {
       mu_debug_t debug;
@@ -365,6 +368,10 @@ do_notify (struct file_triplet *trp, enum notification_event ev,
   const char *errp;
   switch (ntf->tgt)
     {
+    case notify_read:
+      rcpt = NULL;
+      break;
+      
     case notify_admin:
       rcpt = mu_address_dup (admin_address);
       break;
@@ -378,7 +385,7 @@ do_notify (struct file_triplet *trp, enum notification_event ev,
 			    trp, &errp);
     }
 
-  if (!rcpt)
+  if (!rcpt && ntf->tgt != notify_read)
     {
       logmsg (LOG_ERR, _("not notifying %s (project %s) about %s: %s"),
 	      notification_target_str (ntf->tgt),
@@ -389,16 +396,22 @@ do_notify (struct file_triplet *trp, enum notification_event ev,
 
   if (debug_level)
     {
-      size_t size;
-      char *buf;
-      mu_address_to_string (rcpt, NULL, 0, &size);
-      buf = xmalloc (size + 1);
-      mu_address_to_string (rcpt, buf, size + 1, NULL);
-      logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"),
-	      buf, trp->project, notification_event_str (ev));
-      free (buf);
+      if (rcpt)
+	{
+	  size_t size;
+	  char *buf;
+	  mu_address_to_string (rcpt, NULL, 0, &size);
+	  buf = xmalloc (size + 1);
+	  mu_address_to_string (rcpt, buf, size + 1, NULL);
+	  logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"),
+		  buf, trp->project, notification_event_str (ev));
+	  free (buf);
+	}
+      else
+	logmsg (LOG_DEBUG, _("notifying message recipients (project %s) about %s"),
+		trp->project, notification_event_str (ev));
     }
-
+  
   if (!dry_run_mode)
     {
       const char *msg = resolve_message_template (ntf->msg);
diff --git a/src/vtab.c b/src/vtab.c
index 2852d04..70f11d2 100644
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -54,7 +54,7 @@ url_to_vtab (mu_url_t url, struct virt_tab *vtab)
 
 
 int
-move_file (struct file_triplet *trp, const const struct spool *spool,
+move_file (struct file_triplet *trp, const struct spool *spool,
 	   enum file_type file_id, const char *reldir)
 {
   int rc = spool->vtab.move_file (trp, spool, file_id, reldir);
diff --git a/src/wydawca.h b/src/wydawca.h
index bd81b88..805b72b 100644
--- a/src/wydawca.h
+++ b/src/wydawca.h
@@ -270,6 +270,7 @@ enum notification_event
 
 enum notification_target
   {
+    notify_read,         /* Read recipients from the message headers */
     notify_admin,        /* System administrator */
     notify_owner,        /* Project admin */
     notify_user          /* User (uploader) */
-- 
cgit v1.2.1