Small updates

diff --git a/ChangeLog b/ChangeLog
index fc7859ac9867c2fa1fa39a88e410127e9581a427..d039d6d8448e45fa8ed7cdbdbe5624a7f99f6ffe 100644 (file)
--- 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 00534112d921ebcf0787f39c2419f72d51359a08..48b1a7b66218d44cf756554ced7158ba9f07d5e6 100644 (file)
--- 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 93d1de859cd1bc2b0bb50f77b92f027e8e411bbb..b46f8376201df66a4d208998d31fc8a9081315d1 100644 (file)
--- 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 0e6494decb5fa5cb752504a6b17734b8ea29bc62..fb375e6884f08d14b269e531471f38d4490c23bb 100644 (file)
--- 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 95e91b535961df161e367668223a840224aa841a..afa2aa94af7bcd1d930550e43c83644bb1868f51 100644 (file)
--- 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:
-      <input name="mailinglist" type="hidden" value="test@ct.kki.org">
+      <input name="mailinglist" type="hidden" value="mlmmj-test@example.org">
 
       Do you want to subscribe or unsubscribe?
       <input name="job" type="hidden" value="subscribe">
 
-     Where do you want to redirect your user after a failure? 
-     <input name="redirect_failure" type="hidden" value="http://www.failure.com/">
+      Where do you want to redirect your user after a failure? 
+      <input name="redirect_failure" type="hidden" value="http://www.failure.com/">
 
-     What should be the success redirect?
-     <input name="redirect_success" type="hidden" value="http://www.success.com/">
+      What should be the success redirect?
+      <input name="redirect_success" type="hidden" value="http://www.success.com/">
 
 
-That's it - have a fun!
+That's it - have a lot of fun!
 
        Christoph Thiel <ct at kki dot org>

diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index 759be623b3fa063b824319d2ae460b0737b74b09..fc2e845280e49fad729a9f79be085a867f56ebb8 100644 (file)
--- 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;