From: Art Cancro <ajc@uncensored.citadel.org>
Date: Thu, 25 Aug 2011 20:02:40 +0000 (-0400)
Subject: Cleanup of code path for handling message submit errors
X-Git-Tag: v8.11~507
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=8d55ee9e7d148c77d6245651fa922b06d9d65855

Cleanup of code path for handling message submit errors
---

diff --git a/webcit/messages.c b/webcit/messages.c
index 93107db0c..5dcc5c9d3 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1307,7 +1307,6 @@ void display_enter(void)
 	const StrBuf *display_name = NULL;
 	int recipient_required = 0;
 	int subject_required = 0;
-	int recipient_bad = 0;
 	int is_anonymous = 0;
       	wcsession *WCC = WC;
 	int i = 0;
@@ -1595,20 +1594,14 @@ void display_enter(void)
 		rc = GetServerStatusMsg(CmdBuf, &Result, 0, 0);
 
 		if (	(Result == 570)		/* invalid or missing recipient(s) */
-			|| (Result == 550)	/* access control problem */
+			|| (Result == 550)	/* higher access required to send Internet mail */
 		) {
-			if (	havebstr("recp")
-				&& havebstr("cc")
-				&& havebstr("bcc")
-			) {
-				recipient_bad = 1;	/* FIXME ... do something with this? */
-			}
+			/* These errors will have been displayed and are excusable */
 		}
 		else if (rc != 2) {	/* Any other error means that we cannot continue */
-
-			/* FIXME IMMEDIATELY this code results in a blank screen!!! */
-			wc_printf("<em>%s</em><br>\n", ChrPtr(CmdBuf) +4);
+			AppendImportantMessage(ChrPtr(CmdBuf) + 4, StrLength(CmdBuf) - 4);
 			FreeStrBuf(&CmdBuf);
+			readloop(readnew, eUseDefault);
 			return;
 		}
 		FreeStrBuf(&CmdBuf);