diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-11 00:12:41 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-11 00:12:41 +0200 |
| commit | dfe6343d9522cea2e6653abc267b42040925b3e6 (patch) | |
| tree | 85fe0c174281c36a241ca44f828e81148e794b08 /modules | |
| parent | 39a97e438dde837ada9a99cceea93a1cf97db19e (diff) | |
| download | wydawca-dfe6343d9522cea2e6653abc267b42040925b3e6.tar.gz wydawca-dfe6343d9522cea2e6653abc267b42040925b3e6.tar.bz2 | |
Put back admin and owner address expansions.
* src/meta.c (metadef_join): New function.
* src/triplet.c (triplet_expand_param): Extra argument supplies
an additional metadef to use together with triplet_meta.
* src/wydawca.h (triplet_expand_param): Change signature.
* modules/mailutils/mod_mailutils.c (t_notify): Provide
extra metadef for admin and owner addresses.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mailutils/mod_mailutils.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/mailutils/mod_mailutils.c b/modules/mailutils/mod_mailutils.c index a466f80..236406c 100644 --- a/modules/mailutils/mod_mailutils.c +++ b/modules/mailutils/mod_mailutils.c @@ -819,7 +819,12 @@ t_notify(struct mailevt *evt, int ev, struct file_triplet const *trp) const char *errp; char *text; const char *msg; - + static struct metadef email_meta[] = { + { "email:admin", NULL, expand_email_admin, NULL }, + { "email:owner", NULL, expand_email_owner, NULL }, + { NULL } + }; + switch (evt->rcpt) { case notify_read: rcpt = NULL; @@ -868,7 +873,7 @@ t_notify(struct mailevt *evt, int ev, struct file_triplet const *trp) wy_log(LOG_ERR, _("undefined message reference: %s"), evt->msg); else { - text = triplet_expand_param(msg, trp); + text = triplet_expand_param(msg, trp, email_meta); mail_send_message(rcpt, text, evt->sign_keys); free(text); } |