projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d1c8cf5
)
Cleanup of code path for handling message submit errors
author
Art Cancro
<ajc@uncensored.citadel.org>
Thu, 25 Aug 2011 20:02:40 +0000
(16:02 -0400)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 4 Sep 2011 21:55:58 +0000
(21:55 +0000)
webcit/messages.c
patch
|
blob
|
history
diff --git
a/webcit/messages.c
b/webcit/messages.c
index 93107db0c5b074410bf2660f2e4a8afcadab3a51..5dcc5c9d3d02ece4944d3720842ebd6c7ffa8538 100644
(file)
--- 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;
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;
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) */
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 */
}
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);
FreeStrBuf(&CmdBuf);
+ readloop(readnew, eUseDefault);
return;
}
FreeStrBuf(&CmdBuf);
return;
}
FreeStrBuf(&CmdBuf);