From: mmj Date: Mon, 23 Aug 2004 13:20:44 +0000 (+1000) Subject: Small updates X-Git-Tag: RELEASE_1_0_0~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=271e64dcd71ed75abff5da2e022f820e6281cdf5;p=thirdparty%2Fmlmmj.git Small updates --- diff --git a/ChangeLog b/ChangeLog index fc7859ac..d039d6d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ + o php-user updates from Christoph Thiel + o Use Delivered-To: instead of To: when available 1.0.0-RC1 o Add web-interface. Thanks Christian Laursen for new perl-admin o Dump the customheaders before any Mime headers diff --git a/README b/README index 00534112..48b1a7b6 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ -README mlmmj-0.8.3 Aug 11th 2004 +README mlmmj-1.0.0-RC1 Aug 20th 2004 This is an attempt at implementing a mailing list manager with the same functionality as the brilliant ezmlm, but with a decent license and mail server independency. -The functionality is not vast, but slowly improving: +The functionality: · Archive · Custom headers / footer @@ -14,6 +14,8 @@ The functionality is not vast, but slowly improving: · Subject prefix · Subscribers only posting · Regular expression access control + · Functionality to retrieve old posts + · Web-interface To use mlmmj, do the following: diff --git a/VERSION b/VERSION index 93d1de85..b46f8376 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-RC1 +1.0.0-RC2 diff --git a/contrib/web/perl-admin/README b/contrib/web/perl-admin/README index 0e6494de..fb375e68 100644 --- a/contrib/web/perl-admin/README +++ b/contrib/web/perl-admin/README @@ -39,7 +39,8 @@ To enable access control on Apache you have to: Further customization: You can set two environment variables in your apache config to control the -configuration of the mlmmj webinterface. +configuration of the mlmmj webinterface. Remember to have mod_env loaded if +you do this. SetEnv CONFIG_PATH /home/mlmmj/conf/config.pl SetEnv TUNABLES_PATH /home/mlmmj/conf/tunables.pl diff --git a/contrib/web/php-user/README b/contrib/web/php-user/README index 95e91b53..afa2aa94 100644 --- a/contrib/web/php-user/README +++ b/contrib/web/php-user/README @@ -2,34 +2,33 @@ README webinterface Jun 27th 2004 Ehh, what's that? The mlmmj-webinterface was created to give people the opportunity to -{sub,unsub}scribe to your mailinglists without having to write an initial -{sub,unsub}scribe-mail, but only completing a form. +{sub,unsub}scribe to a mailinglists via a webinterface (without having to +write an initial {sub,unsub}scribe-mail). What are the requirements? - Only a webserver, that has PHP >= 3.0.8 support. + You only need a webserver with PHP >= 3.0.8 support. How can I install/use the webinterface? - - Upload webinterface/mlmmj.php to your webserver. - - Have a look at webinterface/example.html and copy one or both forms - and put them into your website. + - Upload mlmmj.php to your webserver. + - Have a look at example.html and copy one or both forms + into your website. - Adjust the options to satisfy your needs: - The mailinglist your want to {sub,unsub}scribe to: - + Do you want to subscribe or unsubscribe? - Where do you want to redirect your user after a failure? - + Where do you want to redirect your user after a failure? + - What should be the success redirect? - + What should be the success redirect? + -That's it - have a fun! +That's it - have a lot of fun! Christoph Thiel diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c index 759be623..fc2e8452 100644 --- a/src/mlmmj-process.c +++ b/src/mlmmj-process.c @@ -348,6 +348,7 @@ int main(int argc, char **argv) struct email_container toemails = { 0, NULL }; struct email_container ccemails = { 0, NULL }; struct email_container efromemails = { 0, NULL }; + struct email_container dtoemails = { 0, NULL }; struct strlist *access_rules = NULL; struct strlist *delheaders = NULL; struct strlist allheaders; @@ -355,7 +356,8 @@ int main(int argc, char **argv) { "From:", 0, NULL }, { "To:", 0, NULL }, { "Cc:", 0, NULL }, - { "Return-Path: ", 0, NULL }, + { "Return-Path:", 0, NULL }, + { "Delivered-To:", 0, NULL }, { NULL, 0, NULL } }; @@ -518,7 +520,17 @@ int main(int argc, char **argv) } } - if(toemails.emaillist) + if(readhdrs[4].token) { /* Delivered-To: (envelope to) */ + for(i = 0; i < readhdrs[4].valuecount; i++) { + find_email_adr(readhdrs[4].values[i], &dtoemails); + } + } + + if(dtoemails.emaillist) { + recipdelim = strchr(dtoemails.emaillist[0], RECIPDELIM); + log_error(LOG_ARGS, "recipdelim = [%s]", recipdelim); + } + else if(toemails.emaillist) recipdelim = strchr(toemails.emaillist[0], RECIPDELIM); else recipdelim = NULL;