summaryrefslogtreecommitdiffabout
path: root/src/mail.c
authorSergey Poznyakoff <gray@gnu.org.ua>2009-02-28 16:54:48 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2009-02-28 16:54:48 (GMT)
commit5fc738e4d43eb708428c4b30e60e570e2dd55470 (patch) (side-by-side diff)
treea96f33c70162ff8a825b800fc9276360d95d154a /src/mail.c
parent514797c56e431f37de9a00834281f990a7b15c46 (diff)
downloadwydawca-5fc738e4d43eb708428c4b30e60e570e2dd55470.tar.gz
wydawca-5fc738e4d43eb708428c4b30e60e570e2dd55470.tar.bz2
Various fixes
* doc/Makefile.am: Improve checking and final rules. * doc/fdl.texi, doc/rendition.texi: Use single-space sentence separators. * doc/wydawca.texi: Update. * src/config.c (cb_email_address): Accept a list of addresses. * src/meta.c (meta_expand_string): Take two additional arguments. Quote expansions if they are provided. * src/triplet.c (triplet_expand_method_query): New function. * src/mail.c, src/verify.c: Use triplet_expand_method_query * src/wydawca.h: Update. * src/meta.c (meta_escape): Remove.
Diffstat (limited to 'src/mail.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/mail.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mail.c b/src/mail.c
index ba77f49..5065306 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -249,7 +249,7 @@ mail_stats ()
admin_stat_message);
return;
}
- text = meta_expand_string (tmpl, exp, NULL);
+ text = meta_expand_string (tmpl, exp, NULL, NULL, NULL);
mail_send_message (admin_address, text);
@@ -264,7 +264,6 @@ get_recipient (struct access_method *method, struct file_triplet *trp,
char **errp)
{
unsigned nrows, ncols, i;
- struct metadef def[5];
mu_address_t rcpt = NULL;
char *text;
int rc;
@@ -283,10 +282,7 @@ get_recipient (struct access_method *method, struct file_triplet *trp,
return NULL;
}
- make_default_meta (def, trp->user, trp->project);
- meta_escape (method, md, def);
- text = meta_expand_string (method->query, def, NULL);
- meta_free (def);
+ text = triplet_expand_method_query (method, md, trp);
rc = method_run (method, md, text);
free (text);

Return to:

Send suggestions and report system problems to the System administrator.