/* HTML is fun, but we've got to strip it first */
else if (!strcasecmp(mime_content_type, "text/html")) {
- output_html(mime_charset, (WC->wc_view == VIEW_WIKI ? 1 : 0));
+ output_html(mime_charset, (WC->wc_view == VIEW_WIKI ? 1 : 0), msgnum);
}
/* Unknown weirdness */
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
int len;
len = strlen(buf);
- if (buf[len-1] == '\n') buf[--len] = 0;
- if (buf[len-1] == '\r') buf[--len] = 0;
+ if ((len > 0) && (buf[len-1] == '\n')) buf[--len] = 0;
+ if ((len > 0) && (buf[len-1] == '\r')) buf[--len] = 0;
#ifdef HAVE_ICONV
if (ic != (iconv_t)(-1) ) {
wprintf("<td>");
- wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
+ wprintf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
addrbook[i].ab_msgnum);
- wprintf("?maxmsgs=1&is_summary=0&alpha=%s\">", bstr("alpha"));
+ wprintf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
vcard_n_prettyize(addrbook[i].ab_name);
escputs(addrbook[i].ab_name);
wprintf("</a></td>\n");
int is_addressbook = 0;
int is_singlecard = 0;
int is_calendar = 0;
+ struct calview calv;
int is_tasks = 0;
int is_notes = 0;
int is_bbview = 0;
is_calendar = 1;
strcpy(cmd, "MSGS ALL|||1");
maxmsgs = 32767;
+ parse_calendar_view_request(&calv);
}
if (WCC->wc_default_view == VIEW_TASKS) { /**< tasks */
is_tasks = 1;
"<table cellspacing=0 style=\"width:100%%\">"
"<tr>"
);
- wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
- "<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
- "<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
+ wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+ "<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+ "<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
" "
"<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
" onClick=\"CtdlDeleteSelectedMessages(event)\" "
addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
}
else if (is_calendar) {
- display_calendar(WCC->msgarr[a], WCC->summ[a].is_new);
+ load_calendar_item(WCC->msgarr[a], WCC->summ[a].is_new, &calv);
}
else if (is_tasks) {
display_task(WCC->msgarr[a], WCC->summ[a].is_new);
}
if (is_calendar) {
- do_calendar_view(); /** Render the calendar */
+ render_calendar_view(&calv);
}
if (is_addressbook) {