if (v->numprops) for (i=0; i<(v->numprops); ++i) {
if (!strcasecmp(v->prop[i].name, "n")) {
strcpy(storename, v->prop[i].value);
+ if ((strlen(storename)>0) && (storename[0] != ';')) {
+ while(storename[strlen(storename)-1] == ';') {
+ storename[strlen(storename)-1] = 0;
+ }
+ }
}
}
}
if (!full) {
wprintf("<TD>");
name = vcard_get_prop(v, "fn", 1, 0, 0);
- if (name == NULL) name = vcard_get_prop(v, "n", 1, 0, 0);
if (name != NULL) {
- strcpy(buf, name);
- escputs(buf);
+ escputs(name);
+ }
+ else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
+ escputs(name);
}
else {
wprintf(" ");
}
else if (!strcasecmp(firsttoken, "email")) {
- if (strlen(mailto) > 0) strcat(mailto, "<BR>");
+ if (strlen(mailto) > 0) strcat(mailto, "<br />");
strcat(mailto,
"<A HREF=\"/display_enter"
"?force_room=_MAIL_&recp=");
strcat(mailto, "</A>");
}
else if (!strcasecmp(firsttoken, "tel")) {
- if (strlen(phone) > 0) strcat(phone, "<BR>");
+ if (strlen(phone) > 0) strcat(phone, "<br />");
strcat(phone, thisvalue);
for (j=0; j<num_tokens(thisname, ';'); ++j) {
extract_token(buf, thisname, j, ';');
extract_token(buf, thisvalue, j, ';');
if (strlen(buf) > 0) {
escputs(buf);
- wprintf("<BR>");
+ wprintf("<br />");
}
}
wprintf("</TD></TR>\n");
serv_printf("MSG4 %ld", msgnum);
serv_gets(buf);
if (buf[0] != '1') {
- wprintf("<STRONG>ERROR:</STRONG> %s<BR>\n", &buf[4]);
+ wprintf("<STRONG>ERROR:</STRONG> %s<br />\n", &buf[4]);
return;
}
/* begin everythingamundo table */
- wprintf("<table width=100% border=1 cellspacing=0 "
+ wprintf("<div style=\"margin-right:1px\">\n");
+ wprintf("<table width=100%% border=1 cellspacing=0 "
"cellpadding=0><TR><TD>\n");
/* begin message header table */
while (serv_gets(buf), strcasecmp(buf, "text")) {
if (!strcmp(buf, "000")) {
- wprintf("<I>unexpected end of message</I><BR><BR>\n");
+ wprintf("<I>unexpected end of message</I><br /><br />\n");
wprintf("</SPAN>\n");
return;
}
"TARGET=\"wc.%ld.%s\">"
"<IMG SRC=\"/static/attachment.gif\" "
"BORDER=0 ALIGN=MIDDLE>\n"
- "Part %s: %s (%s, %d bytes)</A><BR>\n",
+ "Part %s: %s (%s, %d bytes)</A><br />\n",
msgnum, mime_partnum,
msgnum, mime_partnum,
mime_partnum, mime_filename,
wprintf("****");
}
- wprintf("</SPAN></TD>");
+ wprintf("</SPAN>");
+ if (strlen(m_subject) > 0) {
+ wprintf("<br />"
+ "<SPAN CLASS=\"message_subject\">"
+ "Subject: %s"
+ "</SPAN>", m_subject
+ );
+ }
+ wprintf("</TD>\n");
- wprintf("<TD ALIGN=RIGHT>\n"
- "<TABLE BORDER=0><TR>\n");
+ /* start msg buttons */
+ wprintf("<TD ALIGN=RIGHT>\n");
+ wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_one_msg\">\n");
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%ld\">\n",
+ msgnum);
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"");
+ escputs(reply_to);
+ wprintf("\">\n");
- wprintf("<TD BGCOLOR=\"#AAAADD\">"
- "<A HREF=\"/display_enter?recp=");
- urlescputs(reply_to);
if (!strncasecmp(m_subject, "Re:", 2)) {
- wprintf("&subject=");
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"");
escputs(m_subject);
+ wprintf("\">\n");
}
else if (strlen(m_subject) > 0) {
- wprintf("&subject=Re:%%20");
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"Re: ");
escputs(m_subject);
+ wprintf("\">\n");
}
- wprintf("\"><FONT SIZE=-1>Reply</FONT></A></TD>\n", msgnum);
- if (WC->is_room_aide) {
- wprintf("<TD BGCOLOR=\"#AAAADD\">"
- "<A HREF=\"/confirm_move_msg"
- "&msgid=%ld"
- "\"><FONT SIZE=-1>Move</FONT></A>"
- "</TD>\n", msgnum);
+ wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Reply\">\n");
- wprintf("<TD BGCOLOR=\"#AAAADD\">"
- "<A HREF=\"/delete_msg"
- "&msgid=%ld\""
- "onClick=\"return confirm('Delete this message?');\""
- "><FONT SIZE=-1>Del</FONT></A>"
- "</TD>\n", msgnum);
+ if (WC->is_room_aide) {
+ wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\"VALUE=\"Move\">\n"
+ "<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Delete\""
+ "onClick=\"return confirm('Delete this message?');\">\n");
}
- wprintf("</TR></TABLE>\n"
- "</TD>\n");
-
- if (strlen(m_subject) > 0) {
- wprintf("<TR><TD>"
- "<SPAN CLASS=\"message_subject\">"
- "Subject: %s"
- "</SPAN>"
- "</TD><TD> </TD></TR>\n", m_subject);
- }
-
- wprintf("</TR></TABLE>\n");
+ wprintf("</FORM>\n"
+ "</TD></TR></TABLE>\n");
/* Begin body */
wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
strcpy(mime_content_type, "text/plain");
while (serv_gets(buf), (strlen(buf) > 0)) {
if (!strcmp(buf, "000")) {
- wprintf("<I>unexpected end of message</I><BR><BR>\n");
+ wprintf("<I>unexpected end of message</I><br /><br />\n");
goto ENDBODY;
}
if (!strncasecmp(buf, "Content-type: ", 14)) {
buf[strlen(buf) - 1] = 0;
if ((bq == 0) &&
((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
- wprintf("<SPAN CLASS=\"pull_quote\">");
+ wprintf("<BLOCKQUOTE>");
bq = 1;
} else if ((bq == 1) &&
(strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
- wprintf("</SPAN>");
+ wprintf("</BLOCKQUOTE>");
bq = 0;
}
wprintf("<TT>");
url(buf);
escputs(buf);
- wprintf("</TT><BR>\n");
+ wprintf("</TT><br />\n");
}
- wprintf("</I><BR>");
+ wprintf("</I><br />");
}
else /* HTML is fun, but we've got to strip it first */
/* Unknown weirdness */
else {
- wprintf("I don't know how to display %s<BR>\n",
+ wprintf("I don't know how to display %s<br />\n",
mime_content_type);
while (serv_gets(buf), strcmp(buf, "000")) { }
}
wprintf("</TD></TR></TABLE>\n");
/* end everythingamundo table */
- wprintf("</TD></TR></TABLE><BR>\n");
+ wprintf("</TD></TR></TABLE>\n");
+ wprintf("</div>\n");
}
-void summarize_message(long msgnum) {
+void summarize_message(long msgnum, int is_new) {
char buf[SIZ];
struct {
memset(&summ, 0, sizeof(summ));
strcpy(summ.subj, "(no subject)");
- sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */
+ sprintf(buf, "MSG0 %ld|3", msgnum); /* ask for headers only with no MIME */
serv_puts(buf);
serv_gets(buf);
if (buf[0] != '1') return;
}
}
- wprintf("<TD><A HREF=\"/readfwd?startmsg=%ld"
+ wprintf("<TD>");
+ if (is_new) wprintf("<B>");
+ wprintf("<A HREF=\"/readfwd?startmsg=%ld"
"&maxmsgs=1&summary=0\">",
msgnum);
escputs(summ.subj);
- wprintf("</A></TD><TD>");
+ wprintf("</A>");
+ if (is_new) wprintf("</B>");
+ wprintf("</TD><TD>");
+ if (is_new) wprintf("<B>");
escputs(summ.from);
+ if (is_new) wprintf("</B>");
wprintf(" </TD><TD>");
+ if (is_new) wprintf("<B>");
escputs(summ.date);
+ if (is_new) wprintf("</B>");
wprintf(" </TD>");
wprintf("<TD>"
"<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
int mime_length;
char vcard_partnum[SIZ];
char *vcard_source = NULL;
+ int i;
struct {
char date[SIZ];
}
lastfirst_firstlast(namebuf);
+ striplt(namebuf);
+ for (i=0; i<strlen(namebuf); ++i) {
+ if (namebuf[i] != ';') return;
+ }
+ strcpy(namebuf, "(no name)");
}
*/
int abcmp(const void *ab1, const void *ab2) {
return(strcasecmp(
- (((const struct addrbookent *)ab1)->ab_name),
- (((const struct addrbookent *)ab2)->ab_name)
+ (((const struct addrbookent *)ab1)->ab_name),
+ (((const struct addrbookent *)ab2)->ab_name)
));
}
+/*
+ * Helper function for do_addrbook_view()
+ * Converts a name into a three-letter tab label
+ */
+void nametab(char *tabbuf, char *name) {
+ stresc(tabbuf, name, 0, 0);
+ tabbuf[0] = toupper(tabbuf[0]);
+ tabbuf[1] = tolower(tabbuf[1]);
+ tabbuf[2] = tolower(tabbuf[2]);
+ tabbuf[3] = 0;
+}
+
+
/*
* Render the address book using info we gathered during the scan
*/
void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
int i = 0;
+ int displayed = 0;
int bg = 0;
+ static int NAMESPERPAGE = 60;
+ int num_pages = 0;
+ int page = 0;
+ int tabfirst = 0;
+ char tabfirst_label[SIZ];
+ int tablast = 0;
+ char tablast_label[SIZ];
+
+ if (num_ab == 0) {
+ wprintf("<I>This address book is empty.</I>\n");
+ return;
+ }
if (num_ab > 1) {
qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
}
+ num_pages = num_ab / NAMESPERPAGE;
+
+ page = atoi(bstr("page"));
+
+ wprintf("Page: ");
+ for (i=0; i<=num_pages; ++i) {
+ if (i != page) {
+ wprintf("<A HREF=\"/readfwd?page=%d\">", i);
+ }
+ else {
+ wprintf("<B>");
+ }
+ tabfirst = i * NAMESPERPAGE;
+ tablast = tabfirst + NAMESPERPAGE - 1;
+ if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
+ nametab(tabfirst_label, addrbook[tabfirst].ab_name);
+ nametab(tablast_label, addrbook[tablast].ab_name);
+ wprintf("[%s - %s]",
+ tabfirst_label, tablast_label
+ );
+ if (i != page) {
+ wprintf("</A>\n");
+ }
+ else {
+ wprintf("</B>\n");
+ }
+ }
+ wprintf("<br />\n");
+
wprintf("<TABLE border=0 cellspacing=0 "
"cellpadding=3 width=100%%>\n"
);
for (i=0; i<num_ab; ++i) {
- if ((i % 4) == 0) {
- if (i > 0) {
- wprintf("</TR>\n");
+ if ((i / NAMESPERPAGE) == page) {
+
+ if ((displayed % 4) == 0) {
+ if (displayed > 0) {
+ wprintf("</TR>\n");
+ }
+ bg = 1 - bg;
+ wprintf("<TR BGCOLOR=\"#%s\">",
+ (bg ? "DDDDDD" : "FFFFFF")
+ );
}
- bg = 1 - bg;
- wprintf("<TR BGCOLOR=\"#%s\">",
- (bg ? "DDDDDD" : "FFFFFF")
- );
+
+ wprintf("<TD>");
+
+ wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+ addrbook[i].ab_msgnum);
+ wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
+ escputs(addrbook[i].ab_name);
+ wprintf("</A></TD>\n");
+ ++displayed;
}
-
- wprintf("<TD>");
- wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
- addrbook[i].ab_msgnum);
- wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
- escputs(addrbook[i].ab_name);
- wprintf("</A></TD>\n");
}
wprintf("</TR></TABLE>\n");
serv_puts(servcmd);
serv_gets(buf);
if (buf[0] != '1') {
- wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
return (nummsgs);
}
while (serv_gets(buf), strcmp(buf, "000")) {
{
char cmd[SIZ];
char buf[SIZ];
- int a, b, i;
+ char old_msgs[SIZ];
+ int is_new = 0;
+ int a, b;
int nummsgs;
long startmsg;
int maxmsgs;
int is_singlecard = 0;
int is_calendar = 0;
int is_tasks = 0;
+ int is_notes = 0;
int remaining_messages;
int lo, hi;
int lowest_displayed = (-1);
long pn_current = 0L;
long pn_next = 0L;
int bg = 0;
- char alpha = 0;
- char ab_alpha = 0;
struct addrbookent *addrbook = NULL;
int num_ab = 0;
startmsg = atol(bstr("startmsg"));
maxmsgs = atoi(bstr("maxmsgs"));
is_summary = atoi(bstr("summary"));
- if (maxmsgs == 0) maxmsgs = 20;
+ if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
+ /* When in summary mode, always show ALL messages instead of just
+ * new or old. Otherwise, show what the user asked for.
+ */
if (!strcmp(oper, "readnew")) {
strcpy(cmd, "MSGS NEW");
- } else if (!strcmp(oper, "readold")) {
+ }
+ else if (!strcmp(oper, "readold")) {
strcpy(cmd, "MSGS OLD");
- } else {
+ }
+ else {
strcpy(cmd, "MSGS ALL");
}
if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
is_summary = 1;
strcpy(cmd, "MSGS ALL");
- maxmsgs = 32767;
}
if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
maxmsgs = 32767;
}
- is_singlecard = atoi(bstr("is_singlecard"));
-
- /* Display the letter indices across the top */
- if ((is_addressbook) || (is_singlecard)) {
- if (strlen(bstr("alpha")) == 0) {
- alpha = 'a';
- }
- else {
- strcpy(buf, bstr("alpha"));
- alpha = buf[0];
- }
+ if (is_summary) {
+ strcpy(cmd, "MSGS ALL");
+ }
- for (i='1'; i<='z'; ++i) if ((i=='1')||(islower(i))) {
- if ((i != alpha) || (is_singlecard)) {
- wprintf("<A HREF=\"/readfwd?alpha=%c\">", i);
- }
- if (i == alpha) wprintf("<FONT SIZE=+2>");
- if (isalpha(i)) {
- wprintf("%c", toupper(i));
- }
- else {
- wprintf("(other)");
- }
- if (i == alpha) wprintf("</FONT>");
- if ((i != alpha) || (is_singlecard)) {
- wprintf("</A>\n");
- }
- wprintf(" ");
+ /* Are we doing a summary view? If so, we need to know old messages
+ * and new messages, so we can do that pretty boldface thing for the
+ * new messages.
+ */
+ strcpy(old_msgs, "");
+ if (is_summary) {
+ serv_puts("GTSN");
+ serv_gets(buf);
+ if (buf[0] == '2') {
+ strcpy(old_msgs, &buf[4]);
}
-
- wprintf("<HR width=100%%>\n");
}
+ is_singlecard = atoi(bstr("is_singlecard"));
+
if (WC->wc_view == VIEW_CALENDAR) { /* calendar */
is_calendar = 1;
strcpy(cmd, "MSGS ALL");
is_tasks = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
- wprintf("<UL>");
+ }
+ if (WC->wc_view == VIEW_NOTES) { /* notes */
+ is_notes = 1;
+ strcpy(cmd, "MSGS ALL");
+ maxmsgs = 32767;
}
nummsgs = load_msg_ptrs(cmd);
if (nummsgs == 0) {
- if ((!is_tasks) && (!is_calendar)) {
+ if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
if (!strcmp(oper, "readnew")) {
- wprintf("<EM>No new messages in this room.</EM>\n");
+ wprintf("<EM>No new messages.</EM>\n");
} else if (!strcmp(oper, "readold")) {
- wprintf("<EM>No old messages in this room.</EM>\n");
+ wprintf("<EM>No old messages.</EM>\n");
} else {
- wprintf("<EM>This room is empty.</EM>\n");
+ wprintf("<EM>No messages here.</EM>\n");
}
}
}
}
+ wprintf("<FORM NAME=\"msgomatic\" "
+ "METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n");
if (is_summary) {
- wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n"
- "<TABLE border=0 cellspacing=0 "
+ wprintf("<div style=\"margin-right:1px\">"
+ "<table border=0 cellspacing=0 "
"cellpadding=0 width=100%%>\n"
"<TR>"
"<TD><I>Subject</I></TD>"
for (a = 0; a < nummsgs; ++a) {
if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
+ /* Are you a new message, or an old message? */
+ is_new = 0;
+ if (is_summary) {
+ if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {
+ is_new = 0;
+ }
+ else {
+ is_new = 1;
+ }
+ }
+
/* Learn which msgs "Prev" & "Next" buttons go to */
pn_current = WC->msgarr[a];
if (a > 0) pn_previous = WC->msgarr[a-1];
/* Display the message */
if (is_summary) {
- summarize_message(WC->msgarr[a]);
+ summarize_message(WC->msgarr[a], is_new);
}
else if (is_addressbook) {
fetch_ab_name(WC->msgarr[a], buf);
- if ((strlen(buf) > 0) && (isalpha(buf[0]))) {
- ab_alpha = tolower(buf[0]);
- }
- else {
- ab_alpha = '1';
- }
- if (alpha == ab_alpha) {
- ++num_ab;
- addrbook = realloc(addrbook,
- (sizeof(struct addrbookent) * num_ab) );
- safestrncpy(addrbook[num_ab-1].ab_name, buf,
- sizeof(addrbook[num_ab-1].ab_name));
- addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
- }
+ ++num_ab;
+ addrbook = realloc(addrbook,
+ (sizeof(struct addrbookent) * num_ab) );
+ safestrncpy(addrbook[num_ab-1].ab_name, buf,
+ sizeof(addrbook[num_ab-1].ab_name));
+ addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
}
else if (is_calendar) {
display_calendar(WC->msgarr[a]);
else if (is_tasks) {
display_task(WC->msgarr[a]);
}
+ else if (is_notes) {
+ display_note(WC->msgarr[a]);
+ }
else {
read_message(WC->msgarr[a]);
}
}
if (is_summary) {
- wprintf("</TABLE>\n");
- }
-
- if (is_tasks) {
- wprintf("</UL>\n");
+ wprintf("</table></div>\n");
}
/* Bump these because although we're thinking in zero base, the user
/* If we're only looking at one message, do a prev/next thing */
if (num_displayed == 1) {
- if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_singlecard)) {
+ if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
- wprintf("<CENTER>"
- "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
+ wprintf("<div style=\"margin-right:1px\">"
+ "<table border=0 width=100%% bgcolor=\"#dddddd\"><tr><td>"
"Reading #%d of %d messages.</TD>\n"
"<TD ALIGN=RIGHT><FONT SIZE=+1>",
lowest_displayed, nummsgs);
oper,
WC->msgarr[0]);
- wprintf("</TD></TR></TABLE></CENTER>\n");
+ wprintf("</td></tr></table></div>\n");
}
}
-
/*
* If we're not currently looking at ALL requested
* messages, then display the selector bar
*/
if (num_displayed > 1) {
- if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_singlecard)) {
- wprintf("<CENTER>"
- "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
- "Reading #%d-%d of %d messages.</TD>\n"
- "<TD ALIGN=RIGHT><FONT SIZE=+1>",
- lowest_displayed, highest_displayed, nummsgs);
+ if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+ && (!is_notes) && (!is_singlecard)) {
- if (is_summary) {
- wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
- "VALUE=\"Delete selected\">\n");
- }
+ wprintf("Reading #", lowest_displayed, highest_displayed);
+ wprintf("<SELECT NAME=\"whichones\" SIZE=\"1\" "
+ "OnChange=\"location.href=msgomatic.whichones.options"
+ "[selectedIndex].value\">\n");
for (b=0; b<nummsgs; b = b + maxmsgs) {
lo = b+1;
hi = b+maxmsgs;
if (hi > nummsgs) hi = nummsgs;
- if (WC->msgarr[b] != startmsg) {
- wprintf("<A HREF=\"/%s"
- "?startmsg=%ld"
- "&maxmsgs=%d"
- "&summary=%d\">"
- "%d-%d</A> \n",
- oper,
- WC->msgarr[b],
- maxmsgs,
- is_summary,
- lo, hi);
- }
- else {
- wprintf("%d-%d \n", lo, hi);
- }
-
+ wprintf("<OPTION %s VALUE="
+ "\"/%s"
+ "?startmsg=%ld"
+ "&maxmsgs=%d"
+ "&summary=%d\">"
+ "%d-%d</OPTION> \n",
+ ((WC->msgarr[b] == startmsg) ? "SELECTED" : ""),
+ oper,
+ WC->msgarr[b],
+ maxmsgs,
+ is_summary,
+ lo, hi);
}
- wprintf("<A HREF=\"/%s?startmsg=%ld"
+ wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
"&maxmsgs=999999&summary=%d\">"
"ALL"
- "</A> ",
+ "</OPTION> ",
oper,
WC->msgarr[0], is_summary);
- wprintf("<A HREF=\"/%s?startmsg=%ld"
+ wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
"&maxmsgs=999999&summary=1\">"
"Summary"
- "</A>",
+ "</OPTION>",
oper,
WC->msgarr[0]);
- wprintf("</TD></TR></TABLE></CENTER>\n");
+ wprintf("</SELECT> of %d messages.", nummsgs);
+
+ if (is_summary) {
+ wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
+ "VALUE=\"Delete selected\">\n");
+ }
+
}
}
if (is_summary) wprintf("</FORM>\n");
DONE:
if (is_tasks) {
- wprintf("<A HREF=\"/display_edit_task?msgnum=0\">"
- "Add new task</A>\n"
- );
+ do_tasks_view(); /* Render the task list */
}
if (is_calendar) {
{
char buf[SIZ];
static long dont_post = (-1L);
- struct wc_attachment *att;
+ struct wc_attachment *att, *aptr;
if (WC->upload_length > 0) {
+ /* There's an attachment. Save it to this struct... */
att = malloc(sizeof(struct wc_attachment));
memset(att, 0, sizeof(struct wc_attachment));
- att->next = WC->first_attachment;
- WC->first_attachment = att;
att->length = WC->upload_length;
strcpy(att->content_type, WC->upload_content_type);
strcpy(att->filename, WC->upload_filename);
+ att->next = NULL;
+
+ /* And add it to the list. */
+ if (WC->first_attachment == NULL) {
+ WC->first_attachment = att;
+ }
+ else {
+ aptr = WC->first_attachment;
+ while (aptr->next != NULL) aptr = aptr->next;
+ aptr->next = att;
+ }
/* Netscape sends a simple filename, which is what we want,
* but Satan's browser sends an entire pathname. Reduce
return;
}
- if (strcasecmp(bstr("sc"), "Save message")) {
+ if (!strcasecmp(bstr("sc"), "Cancel")) {
sprintf(WC->ImportantMessage,
"Cancelled. Message was not posted.");
+ } else if (!strcasecmp(bstr("attach"), "Add")) {
+ display_enter();
+ return;
} else if (atol(bstr("postseq")) == dont_post) {
sprintf(WC->ImportantMessage,
"Automatically cancelled because you have already "
serv_gets(buf);
if (buf[0] == '4') {
post_mime_to_server();
- sprintf(WC->ImportantMessage,
- "Message has been posted.\n");
+ if (strlen(bstr("recp")) > 0) {
+ sprintf(WC->ImportantMessage, "Message has been sent.\n");
+ }
+ else {
+ sprintf(WC->ImportantMessage, "Message has been posted.\n");
+ }
dont_post = atol(bstr("postseq"));
} else {
sprintf(WC->ImportantMessage,
struct wc_attachment *att;
if (strlen(bstr("force_room")) > 0) {
- gotoroom(bstr("force_room"), 0);
+ gotoroom(bstr("force_room"));
}
/* Are we perhaps in an address book view? If so, then an "enter
* message" command really means "add new entry."
*/
- if (WC->wc_view == 2) {
+ if (WC->wc_view == VIEW_ADDRESSBOOK) {
do_edit_vcard(-1, "", "");
return;
}
- /* Otherwise proceed normally */
- output_headers(1);
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+ /* Are we perhaps in a calendar view? If so, then an "enter
+ * message" command really means "add new calendar item."
+ */
+ if (WC->wc_view == VIEW_CALENDAR) {
+ display_edit_event();
+ return;
+ }
+
+ /* Are we perhaps in a tasks view? If so, then an "enter
+ * message" command really means "add new task."
+ */
+ if (WC->wc_view == VIEW_TASKS) {
+ display_edit_task();
+ return;
+ }
+#endif
+
+ /* Otherwise proceed normally. Do a custom room banner with no navbar... */
+ output_headers(1, 1, 2, 0, 0, 0, 0);
+ wprintf("<div id=\"banner\">\n");
+ embed_room_banner(NULL, navbar_none);
+ wprintf("</div>\n");
+ wprintf("<div id=\"content\">\n");
+
sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
serv_puts(buf);
serv_gets(buf);
if (!strncmp(buf, "570", 3)) {
if (strlen(bstr("recp")) > 0) {
svprintf("RECPERROR", WCS_STRING,
- "<SPAN CLASS=\"errormsg\">%s</SPAN><BR>\n",
+ "<SPAN CLASS=\"errormsg\">%s</SPAN><br />\n",
&buf[4]
);
}
goto DONE;
}
if (buf[0] != '2') {
- wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
goto DONE;
}
}
strcat(&buf[strlen(buf)], " <I>in</I> ");
stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
- svprintf("BOXTITLE", WCS_STRING, buf);
- do_template("beginbox");
- wprintf("<CENTER>\n");
+ /* begin message entry screen */
+ wprintf("<div style=\"position:absolute; left:1%%; width:96%%; height:100%%\">\n");
- wprintf("<FORM ENCTYPE=\"multipart/form-data\" "
- "METHOD=\"POST\" ACTION=\"/post\" "
- "NAME=\"enterform\""
+ wprintf("<form enctype=\"multipart/form-data\" "
+ "method=\"POST\" action=\"/post\" "
+ "name=\"enterform\""
"onSubmit=\"return submitForm();\""
">\n");
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"%s\">\n",
+ wprintf("<input type=\"hidden\" name=\"recp\" value=\"%s\">\n",
bstr("recp"));
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"postseq\" VALUE=\"%ld\">\n",
+ wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n",
now);
- wprintf("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \">");
+
+ wprintf("%s<br>\n", buf); /* header bar */
+ wprintf("<img src=\"static/enter.gif\" align=middle alt=\" \">");
/* "onLoad=\"document.enterform.msgtext.focus();\" " */
- wprintf("<FONT SIZE=-1>Subject (optional):</FONT>"
- "<INPUT TYPE=\"text\" NAME=\"subject\" VALUE=\"");
+ wprintf("<font size=-1>Subject (optional):</font>"
+ "<input type=\"text\" name=\"subject\" value=\"");
escputs(bstr("subject"));
- wprintf("\" MAXLENGTH=70>"
+ wprintf("\" size=40 maxlength=70>"
" "
);
- wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
- "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
+ wprintf("<input type=\"submit\" name=\"sc\" value=\"");
+ if (strlen(bstr("recp")) > 0) {
+ wprintf("Send message");
+ } else {
+ wprintf("Post message");
+ }
+ wprintf("\"> "
+ "<input type=\"submit\" name=\"sc\" value=\"Cancel\">\n");
- wprintf("<SCRIPT language=\"JavaScript\" type=\"text/javascript\" "
- "src=\"static/richtext_compressed.js\"></SCRIPT>\n"
- "<SCRIPT language=\"JavaScript\" type=\"text/javascript\">\n"
+ /* begin richedit box */
+ wprintf("<div style=\"position:absolute; left:0%%; width:100%%; "
+ "top:15%; height:75%%\">\n");
+
+ wprintf("<script type=\"text/javascript\" "
+ "src=\"static/richtext.js\"></script>\n"
+ "<script type=\"text/javascript\">\n"
"function submitForm() { \n"
" updateRTE('msgtext'); \n"
" return true; \n"
" \n"
"initRTE(\"static/\", \"static/\", \"\"); \n"
"</script> \n"
- "<noscript>JAVASCRIPT MUST BE ENABLED.</noscript> \n"
- "<SCRIPT language=\"javascript\" type=\"text/javascript\"> \n"
+ "<noscript>JAVAscript MUST BE ENABLED.</noscript> \n"
+ "<script type=\"text/javascript\"> \n"
"writeRichText('msgtext', '");
msgescputs(bstr("msgtext"));
- wprintf("', '100%%', 200, true, false); \n"
+ wprintf("', '100%%', '80%%', true, false); \n"
"</script> \n");
+ wprintf("</div>\n"); /* end richedit box */
-/*
- * Before we had the richedit widget, we did it this way...
- *
- wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
- "WIDTH=80>");
- escputs(bstr("msgtext"));
- wprintf("</TEXTAREA><BR>\n");
- */
+ /* Here comes the "do attachments" section on the bottom */
+ wprintf("<div style=\"position:absolute; bottom:0px; left:0px; width:100%%\">\n");
/* Enumerate any attachments which are already in place... */
+ wprintf("<img src=\"/static/attachment.gif\" border=0 "
+ "align=middle height=16 width=16> Attachments: ");
+ wprintf("<select name=\"which_attachment\" size=1>");
for (att = WC->first_attachment; att != NULL; att = att->next) {
- wprintf("<IMG SRC=\"/static/attachment.gif\" "
- "BORDER=0 ALIGN=MIDDLE> Attachment: ");
+ wprintf("<option value=\"");
+ urlescputs(att->filename);
+ wprintf("\">");
escputs(att->filename);
- wprintf(" (%s, %d bytes)<BR>\n",
- att->content_type, att->length);
+ /* wprintf(" (%s, %d bytes)",att->content_type,att->length); */
+ wprintf("</option>\n");
}
+ wprintf("</select>");
/* Now offer the ability to attach additional files... */
wprintf(" "
"Attach file: <input NAME=\"attachfile\" "
- "SIZE=48 TYPE=\"file\">\n "
+ "SIZE=16 TYPE=\"file\">\n "
"<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
- wprintf("</FORM></CENTER>\n");
- do_template("endbox");
+ wprintf("</div>\n"); /* end attachments section */
+
+ wprintf("</FORM>\n");
+
+ wprintf("</div>\n");
DONE: wDumpContent(1);
}
msgid = atol(bstr("msgid"));
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
sprintf(buf, "DELE %ld", msgid);
serv_puts(buf);
serv_gets(buf);
- wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
wDumpContent(1);
}
msgid = atol(bstr("msgid"));
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
- wprintf("<FONT SIZE=+1 COLOR=\"#FFFFFF\"");
- wprintf("<B>Confirm move of message</B>\n");
- wprintf("</FONT></TD></TR></TABLE>\n");
+ wprintf("<div style=\"margin-right:1px\">"
+ "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
+ wprintf("<font size=+1 color=\"#ffffff\"");
+ wprintf("<b>Confirm move of message</b>\n");
+ wprintf("</font></td></tr></table></div>\n");
wprintf("<CENTER>");
- wprintf("Please select the room to which you would like this message moved:<BR>\n");
+ wprintf("Move this message to:<br />\n");
wprintf("<FORM METHOD=\"POST\" ACTION=\"/move_msg\">\n");
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
}
}
wprintf("</SELECT>\n");
- wprintf("<BR>\n");
+ wprintf("<br />\n");
wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Move\">");
+ wprintf(" ");
wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Cancel\">");
wprintf("</FORM></CENTER>\n");
msgid = atol(bstr("msgid"));
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
if (!strcasecmp(bstr("yesno"), "Move")) {
sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
serv_puts(buf);
serv_gets(buf);
- wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
} else {
- wprintf("<EM>Message not moved.</EM><BR>\n");
+ wprintf("<EM>Message not moved.</EM><br />\n");
}
wDumpContent(1);
}
+/*
+ * This gets called when a user selects Reply/Move/Del etc. on *one* message.
+ */
+void do_stuff_to_one_msg(void) {
+ char *msg_oper;
+
+ msg_oper = bstr("msg_oper");
+
+ if (!strcasecmp(msg_oper, "Delete")) {
+ delete_msg(); /* It's already been confirmed using JS */
+ return;
+ }
+ if (!strcasecmp(msg_oper, "Move")) {
+ confirm_move_msg();
+ return;
+ }
+ if (!strcasecmp(msg_oper, "Reply")) {
+ display_enter(); /* recp and subject already set */
+ return;
+ }
+
+ /* should never get here. FIXME: display an error */
+
+}
+/*
+ * This gets called when a user selects multiple messages in a summary
+ * list and then clicks to perform a transformation of some sort on them
+ * (such as deleting them).
+ */
void do_stuff_to_msgs(void) {
char buf[SIZ];
char sc[SIZ];
projects / citadel.git / blobdiff