Mark a bunch of stuff as deprecated.

Replacing some generic stuff with even more generic stuff, looking forward to
the day when we will do things like http://$www$.$domain$/$list$/archive.

--HG--
extra : rebase_source : e0c18aba2f9b52479e34181bd9399f7e423337d7

diff --git a/README.listtexts b/README.listtexts
index d4c9e643b81aee8f1e96540125e455929f8d7bf8..ea6253b86b2c1cf0c66755cd6f85471fa67051cd 100644 (file)
--- a/README.listtexts
+++ b/README.listtexts
@@ -173,6 +173,7 @@ multi-line substitutions and would not work in a header):
 
 - $digestsubaddr$
   listname+subscribe-digest@domain.tld
+  DEPRECATED: use $list+$subscribe-digest@$domain$ instead
 
 - $digestthreads$
   (available only in digest)
@@ -180,29 +181,46 @@ multi-line substitutions and would not work in a header):
 
 - $digestunsubaddr$
   listname+unsubscribe-digest@domain.tld
+  DEPRECATED: use $list+$unsubscribe-digest@$domain$ instead
+
+- $domain$
+  domain.tld
 
 - $faqaddr$
   listname+faq@domain.tld
+  DEPRECATED: use $list+$faq@$domain$ instead
 
 - $helpaddr$
   listname+help@domain.tld
+  DEPRECATED: use $list+$help@$domain$ instead
+
+- $list$
+  listname
+
+- $list+$
+  listname+
 
 - $listaddr$
   listname@domain.tld
+  DEPRECATED: use $list$@$domain$ instead
 
 - $listgetN$
   listname+get-N@domain.tld
   (the N here is nothing special, so this won't actually work, but is used to
   explain to users how to use the +get functionality)
+  DEPRECATED: use $list+$get-N@$domain$ instead
 
 - $listowner$
   listname+owner@domain.tld
+  DEPRECATED: use $list+$owner@$domain$ instead
 
 - $listsubaddr$
   listname+subscribe@domain.tld
+  DEPRECATED: use $list+$subscribe@$domain$ instead
 
 - $listunsubaddr$
   listname+unsubscribe@domain.tld
+  DEPRECATED: use $list+$unsubscribe@$domain$ instead
 
 - $maxmailsize$
   (available only in maxmailsize)
@@ -223,9 +241,11 @@ multi-line substitutions and would not work in a header):
 
 - $nomailsubaddr$
   listname+subscribe-nomail@domain.tld
+  DEPRECATED: use $list+$subscribe-nomail@$domain$ instead
 
 - $nomailunsubaddr$
   listname+unsubscribe-nomail@domain.tld
+  DEPRECATED: use $list+$unsubscribe-nomail@$domain$ instead
 
 - $oldsub$
   (available only in notifyunsub, notifyunsub-digest and notifyunsub-nomail)

diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index 2383a0ced81745af9f0753c99e38d0a12b543338..d82e6de87d056ebd016069cd4a37aafc2683cbd6 100644 (file)
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -100,39 +100,59 @@ char *substitute_one(const char *line, const char *listaddr,
        listname = genlistname(listaddr);
 
        if(strcmp(token, "listaddr") == 0) {
+               /* DEPRECATED: use $list$@$domain$ instead */
                value = mystrdup(listaddr);
                goto concatandreturn;
+       } else if(strcmp(token, "list+") == 0) {
+               value = concatstr(2, listname, listdelim);
+               goto concatandreturn;
+       } else if(strcmp(token, "list") == 0) {
+               value = mystrdup(listname);
+               goto concatandreturn;
+       } else if(strcmp(token, "domain") == 0) {
+               value = mystrdup(fqdn);
+               goto concatandreturn;
        } else if(strcmp(token, "listowner") == 0) {
+               /* DEPRECATED: use $list+$owner@$domain$ instead */
                value = concatstr(4, listname, listdelim, "owner@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "helpaddr") == 0) {
+               /* DEPRECATED: use $list+$help@$domain$ instead */
                value = concatstr(4, listname, listdelim, "help@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "faqaddr") == 0) {
+               /* DEPRECATED: use $list+$faq@$domain$ instead */
                value = concatstr(4, listname, listdelim, "faq@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "listgetN") == 0) {
+               /* DEPRECATED: use $list+$get-N@$domain$ instead */
                value = concatstr(4, listname, listdelim, "get-N@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "listunsubaddr") == 0) {
+               /* DEPRECATED: use $list+$unsubscribe@$domain$ instead */
                value = concatstr(4, listname, listdelim, "unsubscribe@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "digestunsubaddr") == 0) {
+               /* DEPRECATED: use $list+$unsubscribe-digest@$domain$ instead */
                value = concatstr(4, listname, listdelim,
                                  "unsubscribe-digest@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "nomailunsubaddr") == 0) {
+               /* DEPRECATED: use $list+$unsubscribe-nomail@$domain$ instead */
                value = concatstr(4, listname, listdelim,
                                  "unsubscribe-nomail@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "listsubaddr") == 0) {
+               /* DEPRECATED: use $list+$subscribe@$domain$ instead */
                value = concatstr(4, listname, listdelim, "subscribe@", fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "digestsubaddr") == 0) {
+               /* DEPRECATED: use $list+$subscribe-digest@$domain$ instead */
                value = concatstr(4, listname, listdelim, "subscribe-digest@",
                                  fqdn);
                goto concatandreturn;
        } else if(strcmp(token, "nomailsubaddr") == 0) {
+               /* DEPRECATED: use $list+$subscribe-nomail@$domain$ instead */
                value = concatstr(4, listname, listdelim, "subscribe-nomail@",
                                  fqdn);
                goto concatandreturn;