message formatting: remove all deprecated variables

diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index a169bd9ebad176a475e9db928b38cbf1f1ab78d6..301d843daba3164938682bfc3baabb42dc751d08 100644 (file)
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -169,10 +169,8 @@ static void newmoderated(struct ml *ml, const char *mailfilename,
        register_default_unformatted(txt, ml);
        register_unformatted(txt, "subject", subject);
        register_unformatted(txt, "posteraddr", posteraddr);
-       register_unformatted(txt, "moderateaddr", replyto); /* DEPRECATED */
        register_unformatted(txt, "releaseaddr", replyto);
        register_unformatted(txt, "rejectaddr", reject);
-       register_unformatted(txt, "moderators", "%moderators%"); /* DEPRECATED */
        register_formatted(txt, "moderators",
                        rewind_memory_lines, get_memory_line, mls);
        register_originalmail(txt, mailfilename);
@@ -194,7 +192,6 @@ static void newmoderated(struct ml *ml, const char *mailfilename,
                register_default_unformatted(txt, ml);
                register_unformatted(txt, "subject", subject);
                register_unformatted(txt, "posteraddr", posteraddr);
-               register_unformatted(txt, "moderators", "%moderators%"); /* DEPRECATED */
                register_formatted(txt, "moderators",
                                rewind_memory_lines, get_memory_line, mls);
                register_originalmail(txt, mailfilename);

diff --git a/src/mlmmj.c b/src/mlmmj.c
index 3711aaa23e5eaed31ed7f14409c0574cbff4f92f..6c2ce8666d8a79c48b1316bbae0c078c4b723891 100644 (file)
--- a/src/mlmmj.c
+++ b/src/mlmmj.c
@@ -83,7 +83,6 @@ send_probe(struct ml *ml, const char *addr)
        txt = open_text(ml->fd, "probe", NULL, NULL, NULL, "bounce-probe");
        MY_ASSERT(txt);
        register_default_unformatted(txt, ml);
-       register_unformatted(txt, "bouncenumbers", "%bouncenumbers%"); /* DEPRECATED */
        fls = init_file_lines_fd(openat(bfd, addr, O_RDONLY), ':');
        register_formatted(txt, "bouncenumbers",
                        rewind_file_lines, get_file_line, fls);

diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index 8081e13d15a585592def85d9956c726767a1d32a..b14ecb1e7719ce66628b2a9cb0bb1d29bb57d1e7 100644 (file)
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -310,9 +310,6 @@ do_substitute(xstring *str, const char *line, int listfd, int ctrlfd, text *txt)
                token = xstrndup(key + 5, endpos - key + 5);
                if (strchr(token, '/') == NULL) /* ensure stay in the directory */
                        value = textcontent(listfd, token);
-       } else if(strcmp(key, "originalmail") == 0) {
-               /* DEPRECATED: use %originalmail% instead */
-               fputs(" %originalmail 100%", str->fp);
        } else {
                found = false;
                tll_foreach(txt->substs, it) {
@@ -361,9 +358,6 @@ static void substitute_one(char **line_p, char **pos_p, int *width_p,
        } else if(strncmp(token, "text ", 5) == 0) {
                token = filename_token(token + 5);
                if (token != NULL) value = textcontent(listfd, token);
-       } else if(strcmp(token, "originalmail") == 0) {
-               /* DEPRECATED: use %originalmail% instead */
-               value = xstrdup(" %originalmail 100%");
        } else {
                tll_foreach(txt->substs, it) {
                        subst = it->item;

diff --git a/src/send_digest.c b/src/send_digest.c
index aeab459777a247f67c209334bd71c1ab0a516300..27234f9a213a3238a05f4995578d466578e22e7f 100644 (file)
--- a/src/send_digest.c
+++ b/src/send_digest.c
@@ -294,8 +294,6 @@ int send_digest(struct ml *ml, int firstindex, int lastindex,
        snprintf(buf, sizeof(buf), "%d", issue);
        register_unformatted(txt, "digestissue", buf);
 
-       register_unformatted(txt, "digestthreads", "%digestthreads%"); /* DEPRECATED */
-
        tls = init_thread_list(ml->dir, firstindex, lastindex);
        register_formatted(txt, "digestthreads", rewind_thread_list,
                        get_thread_list_line, tls);

diff --git a/src/subscriberfuncs.c b/src/subscriberfuncs.c
index 9fab8b6661da35d5f1ff8a6fbe68a3c9a72edf25..f197b731ab5f7e0e214e47d77d750cde47e739b9 100644 (file)
--- a/src/subscriberfuncs.c
+++ b/src/subscriberfuncs.c
@@ -213,7 +213,6 @@ notify_sub(struct ml *ml, const char *subaddr, enum subtype typesub,
        MY_ASSERT(txt);
        register_default_unformatted(txt, ml);
        register_unformatted(txt, "subaddr", subaddr);
-       register_unformatted(txt, sub ? "newsub" : "oldsub", subaddr); /* DEPRECATED */
        queuefilename = prepstdreply(txt, ml, "$listowner$", "$listowner$", NULL);
        MY_ASSERT(queuefilename);
        close_text(txt);
@@ -307,7 +306,6 @@ generate_subconfirm(struct ml *ml, const char *subaddr, enum subtype typesub,
        MY_ASSERT(txt);
        register_default_unformatted(txt, ml);
        register_unformatted(txt, "subaddr", subaddr);
-       register_unformatted(txt, "confaddr", confirmaddr); /* DEPRECATED */
        register_unformatted(txt, "confirmaddr", confirmaddr);
        queuefilename = prepstdreply(txt, ml, "$helpaddr$", subaddr, confirmaddr);
        MY_ASSERT(queuefilename);
@@ -548,10 +546,8 @@ static void moderate_sub(struct ml *ml, const char *subaddr,
        MY_ASSERT(txt);
        register_default_unformatted(txt, ml);
        register_unformatted(txt, "subaddr", subaddr);
-       register_unformatted(txt, "moderateaddr", replyto); /* DEPRECATED */
        register_unformatted(txt, "permitaddr", replyto);
        register_unformatted(txt, "obstructaddr", obstruct);
-       register_unformatted(txt, "moderators", "%gatekeepers%"); /* DEPRECATED */
        register_formatted(txt, "gatekeepers",
                        rewind_memory_lines, get_memory_line, mls);
        queuefilename = prepstdreply(txt, ml, "$listowner$", to, replyto);
@@ -600,7 +596,6 @@ static void moderate_sub(struct ml *ml, const char *subaddr,
        MY_ASSERT(txt);
        register_default_unformatted(txt, ml);
        register_unformatted(txt, "subaddr", subaddr);
-       register_unformatted(txt, "moderators", "%gatekeepers"); /* DEPRECATED */
        register_formatted(txt, "gatekeepers",
                        rewind_memory_lines, get_memory_line, mls);
        queuefilename = prepstdreply(txt, ml, "$listowner$", subaddr, NULL);