Fixed (hopefully) the mailing list problem.

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 3b14fab76057d65ae2730c823c794e411eb3b741..cd858ba10fee0b289f037b8d45e6b9d408635da2 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -595,7 +595,7 @@ void smtp_rcpt(char *argbuf) {
                                    smtp_get_Recipients (),
                                    (CC->logged_in)? POST_LOGGED_IN:POST_EXTERNAL);
        if (valid->num_error != 0) {
-               cprintf("599 Error: %s\r\n", valid->errormsg);
+               cprintf("550 %s\r\n", valid->errormsg);
                free_recipients(valid);
                return;
        }

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 1587dcdfb3e50a66fcdf8f92a97dfef360ac63cc..cc7870adc69f6c00c8b19452fb7e27bcce8d18d3 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -3130,16 +3130,21 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
                        if (!read_spoolcontrol_file(&sc, filename))
                        {
                                end_critical_section(S_NETCONFIGS);
-                               snprintf(errmsgbuf, n, "This mailing list only accepts posts from subscribers.");
+                               snprintf(errmsgbuf, n,
+                                       "This mailing list only accepts posts from subscribers.");
                                return (ERROR + NO_SUCH_USER);
                        }
                        end_critical_section(S_NETCONFIGS);
                        found = is_recipient (sc, RemoteIdentifier);
                        free_spoolcontrol_struct(&sc);
-                       if (found)
+                       if (found) {
                                return (0);
-                       else
+                       }
+                       else {
+                               snprintf(errmsgbuf, n,
+                                       "This mailing list only accepts posts from subscribers.");
                                return (ERROR + NO_SUCH_USER);
+                       }
                }
                return (0);
 
@@ -3292,6 +3297,7 @@ struct recptypes *validate_recipients(char *supplied_recipients,
                }
                this_recp_cooked[j] = '\0';
                invalid = 0;
+               errmsg[0] = 0;
                switch(mailtype) {
                        case MES_LOCAL:
                                if (!strcasecmp(this_recp, "sysop")) {
@@ -3329,10 +3335,10 @@ struct recptypes *validate_recipients(char *supplied_recipients,
                                        err = CtdlDoIHavePermissionToPostInThisRoom(errmsg, 
                                                                                    sizeof errmsg, 
                                                                                    RemoteIdentifier,
-                                                                                   Flags);
+                                                                                   Flags
+                                       );
                                        if (err)
                                        {
-                                               cprintf("%d %s\n", err, errmsg);
                                                ++ret->num_error;
                                                invalid = 1;
                                        } 
@@ -3385,15 +3391,16 @@ struct recptypes *validate_recipients(char *supplied_recipients,
                                break;
                }
                if (invalid) {
-                       if (IsEmptyStr(ret->errormsg)) {
-                               snprintf(append, sizeof append,
-                                        "Invalid recipient: %s",
-                                        this_recp);
+                       if (IsEmptyStr(errmsg)) {
+                               snprintf(append, sizeof append, "Invalid recipient: %s", this_recp);
                        }
                        else {
-                               snprintf(append, sizeof append, ", %s", this_recp);
+                               snprintf(append, sizeof append, "%s", errmsg);
                        }
-                       if ( (strlen(ret->errormsg) + strlen(append)) < SIZ) {
+                       if ( (strlen(ret->errormsg) + strlen(append) + 3) < SIZ) {
+                               if (!IsEmptyStr(ret->errormsg)) {
+                                       strcat(ret->errormsg, "; ");
+                               }
                                strcat(ret->errormsg, append);
                        }
                }
@@ -3577,14 +3584,14 @@ void cmd_ent0(char *entargs)
 
                valid_to = validate_recipients(recp, NULL, 0);
                if (valid_to->num_error > 0) {
-                       cprintf("%d Invalid recipient (To)\n", ERROR + NO_SUCH_USER);
+                       cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_to->errormsg);
                        free_recipients(valid_to);
                        return;
                }
 
                valid_cc = validate_recipients(cc, NULL, 0);
                if (valid_cc->num_error > 0) {
-                       cprintf("%d Invalid recipient (CC)\n", ERROR + NO_SUCH_USER);
+                       cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_cc->errormsg);
                        free_recipients(valid_to);
                        free_recipients(valid_cc);
                        return;
@@ -3592,7 +3599,7 @@ void cmd_ent0(char *entargs)
 
                valid_bcc = validate_recipients(bcc, NULL, 0);
                if (valid_bcc->num_error > 0) {
-                       cprintf("%d Invalid recipient (BCC)\n", ERROR + NO_SUCH_USER);
+                       cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_bcc->errormsg);
                        free_recipients(valid_to);
                        free_recipients(valid_cc);
                        free_recipients(valid_bcc);

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 580772a803970833ffd070db807567fedc9d171a..3c78875e868ae5bd63755328af040c5deed4b978 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -538,14 +538,15 @@ void output_headers(      int do_httpheaders,     /**< 1 = output HTTP headers
 
                /** check for ImportantMessages (these display in a div overlaying the main screen) */
                if (!IsEmptyStr(WC->ImportantMessage)) {
-                       wprintf("<div id=\"important_message\">\n");
-                       wprintf("<span class=\"imsg\">"
-                               "%s</span><br />\n", WC->ImportantMessage);
-                       wprintf("</div>\n");
-                       wprintf("<script type=\"text/javascript\">\n"
-                               "        setTimeout('hide_imsg_popup()', 3000); \n"
+                       wprintf("<div id=\"important_message\">\n"
+                               "<span class=\"imsg\">");
+                       escputs(WC->ImportantMessage);
+                       wprintf("</span><br />\n"
+                               "</div>\n"
+                               "<script type=\"text/javascript\">\n"
+                               "        setTimeout('hide_imsg_popup()', 5000); \n"
                                "</script>\n");
-                       safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+                       WC->ImportantMessage[0] = 0;
                }
 
                if ( (WC->logged_in) && (!unset_cookies) ) {