X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fnotes.c;h=d9d0ebf65b4867dcf869f529bd618e241c2fc021;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=bc5d78952ebcc4282dac57654f66dffac2e61b1d;hpb=88de455b9a1e89a9d41f55cc4e1a32beacf03a78;p=citadel.git diff --git a/webcit/notes.c b/webcit/notes.c index bc5d78952..d9d0ebf65 100644 --- a/webcit/notes.c +++ b/webcit/notes.c @@ -1,10 +1,6 @@ -/* - * $Id$ - * - */ #include "webcit.h" -#include "groupdav.h" +#include "dav.h" #include "webserver.h" int pastel_palette[9][3] = { @@ -26,32 +22,31 @@ int pastel_palette[9][3] = { struct vnote *vnote_new_from_msg(long msgnum,int unread) { StrBuf *Buf; - StrBuf *Data; + StrBuf *Data = NULL; const char *bptr; int Done = 0; - char from[128] = ""; char uid_from_headers[256]; char mime_partnum[256]; char mime_filename[256]; char mime_content_type[256]; char mime_disposition[256]; - int mime_length; char relevant_partnum[256]; int phase = 0; /* 0 = citadel headers, 1 = mime headers, 2 = body */ char msg4_content_type[256] = ""; char msg4_content_encoding[256] = ""; int msg4_content_length = 0; struct vnote *vnote_from_body = NULL; + int vnote_inline = 0; /* 1 = MSG4 gave us a text/x-vnote top level */ relevant_partnum[0] = '\0'; serv_printf("MSG4 %ld", msgnum); /* we need the mime headers */ Buf = NewStrBuf(); - StrBuf_ServGetlnBuffered(Buf); + StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 1) { FreeStrBuf (&Buf); return NULL; } - while ((StrBuf_ServGetlnBuffered(Buf)>=0) && !Done) { + while ((StrBuf_ServGetln(Buf)>=0) && !Done) { if ( (StrLength(Buf)==3) && !strcmp(ChrPtr(Buf), "000")) { Done = 1; @@ -68,18 +63,11 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread) extract_token(mime_partnum, &bptr[5], 2, '|', sizeof mime_partnum); extract_token(mime_disposition, &bptr[5], 3, '|', sizeof mime_disposition); extract_token(mime_content_type, &bptr[5], 4, '|', sizeof mime_content_type); - mime_length = extract_int(&bptr[5], 5); - if ( (!strcasecmp(mime_content_type, "text/calendar")) - || (!strcasecmp(mime_content_type, "application/ics")) - || (!strcasecmp(mime_content_type, "text/vtodo")) - ) { + if (!strcasecmp(mime_content_type, "text/vnote")) { strcpy(relevant_partnum, mime_partnum); } } - else if (!strncasecmp(bptr, "from=", 4)) { - extract_token(from, bptr, 1, '=', sizeof(from)); - } else if ((phase == 0) && (!strncasecmp(bptr, "text", 4))) { phase = 1; } @@ -101,29 +89,29 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread) } else { phase++; - if ((msg4_content_length > 0) && ( !strcasecmp(msg4_content_encoding, "7bit")) - && ((!strcasecmp(mime_content_type, "text/calendar")) - || (!strcasecmp(mime_content_type, "application/ics")) - || (!strcasecmp(mime_content_type, "text/vtodo")) - ) - ) - { + && (!strcasecmp(msg4_content_type, "text/vnote")) + ) { + vnote_inline = 1; } } case 2: - Data = NewStrBufPlain(NULL, msg4_content_length * 2); - if (msg4_content_length > 0) { - StrBuf_ServGetBLOBBuffered(Data, msg4_content_length); - phase ++; + if (vnote_inline) { + Data = NewStrBufPlain(NULL, msg4_content_length * 2); + if (msg4_content_length > 0) { + StrBuf_ServGetBLOBBuffered(Data, msg4_content_length); + phase ++; + } + else { + StrBufAppendBuf(Data, Buf, 0); + StrBufAppendBufPlain(Data, "\r\n", 1, 0); + } } - else { + case 3: + if (vnote_inline) { StrBufAppendBuf(Data, Buf, 0); - StrBufAppendBufPlain(Data, "\r\n", 1, 0); } - case 3: - StrBufAppendBuf(Data, Buf, 0); } } FreeStrBuf(&Buf); @@ -131,14 +119,13 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread) /* If MSG4 didn't give us the part we wanted, but we know that we can find it * as one of the other MIME parts, attempt to load it now. */ - if ((Data == NULL) && (!IsEmptyStr(relevant_partnum))) { + if ((!vnote_inline) && (!IsEmptyStr(relevant_partnum))) { Data = load_mimepart(msgnum, relevant_partnum); } - - if ((IsEmptyStr(relevant_partnum)) && (StrLength(Data) > 0 )) { - if (!IsEmptyStr(uid_from_headers)) { - // Convert an old-style note to a vNote + if (StrLength(Data) > 0) { + if (IsEmptyStr(uid_from_headers)) { + /* Convert an old-style note to a vNote */ vnote_from_body = vnote_new(); vnote_from_body->uid = strdup(uid_from_headers); vnote_from_body->color_red = pastel_palette[3][0]; @@ -147,10 +134,14 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread) vnote_from_body->body = malloc(StrLength(Data) + 1); vnote_from_body->body[0] = 0; memcpy(vnote_from_body->body, ChrPtr(Data), StrLength(Data) + 1); + FreeStrBuf(&Data); return vnote_from_body; } else { - struct vnote *v = vnote_new_from_str(ChrPtr(Data)); + char *Buf = SmashStrBuf(&Data); + + struct vnote *v = vnote_new_from_str(Buf); + free(Buf); return(v); } } @@ -166,15 +157,38 @@ void write_vnote_to_server(struct vnote *v) { char buf[1024]; char *pch; + char boundary[256]; + static int seq = 0; + + snprintf(boundary, sizeof boundary, "Citadel--Multipart--%s--%04x--%04x", + ChrPtr(WC->serv_info->serv_fqdn), + getpid(), + ++seq + ); serv_puts("ENT0 1|||4"); serv_getln(buf, sizeof buf); if (buf[0] == '4') { + /* Remember, serv_printf() appends an extra newline */ + serv_printf("Content-type: multipart/alternative; " + "boundary=\"%s\"\n", boundary); + serv_printf("This is a multipart message in MIME format.\n"); + serv_printf("--%s", boundary); + + serv_puts("Content-type: text/plain; charset=utf-8"); + serv_puts("Content-Transfer-Encoding: 7bit"); + serv_puts(""); + serv_puts(v->body); + serv_puts(""); + + serv_printf("--%s", boundary); serv_puts("Content-type: text/vnote"); + serv_puts("Content-Transfer-Encoding: 7bit"); serv_puts(""); pch = vnote_serialize(v); serv_puts(pch); free(pch); + serv_printf("--%s--", boundary); serv_puts("000"); } } @@ -193,40 +207,38 @@ void ajax_update_note(void) { if (!havebstr("note_uid")) { begin_ajax_response(); - wprintf("Received ajax_update_note() request without a note UID."); + wc_printf("Received ajax_update_note() request without a note UID."); end_ajax_response(); return; } - // lprintf(9, "Note UID = %s\n", bstr("note_uid")); serv_printf("EUID %s", bstr("note_uid")); serv_getln(buf, sizeof buf); if (buf[0] != '2') { begin_ajax_response(); - wprintf("Cannot find message containing vNote with the requested uid!"); + wc_printf("Cannot find message containing vNote with the requested uid!"); end_ajax_response(); return; } msgnum = atol(&buf[4]); - // lprintf(9, "Note msg = %ld\n", msgnum); - - // Was this request a delete operation? If so, nuke it... + + /* Was this request a delete operation? If so, nuke it... */ if (havebstr("deletenote")) { if (!strcasecmp(bstr("deletenote"), "yes")) { serv_printf("DELE %d", msgnum); serv_getln(buf, sizeof buf); begin_ajax_response(); - wprintf("%s", buf); + wc_printf("%s", buf); end_ajax_response(); return; } } - // If we get to this point it's an update, not a delete + /* If we get to this point it's an update, not a delete */ v = vnote_new_from_msg(msgnum, 0); if (!v) { begin_ajax_response(); - wprintf("Cannot locate a vNote within message %d\n", msgnum); + wc_printf("Cannot locate a vNote within message %d\n", msgnum); end_ajax_response(); return; } @@ -253,7 +265,7 @@ void ajax_update_note(void) { if (havebstr("blue")) { v->color_blue = atoi(bstr("blue")); } - if (havebstr("value")) { // I would have preferred 'body' but InPlaceEditor hardcodes 'value' + if (havebstr("value")) { /* I would have preferred 'body' but InPlaceEditor hardcodes 'value' */ if (v->body) free(v->body); v->body = strdup(bstr("value")); } @@ -278,13 +290,19 @@ void ajax_update_note(void) { * * msgnum = Message number on the local server of the note to be displayed */ -void display_note(message_summary *Msg, int unread) { +/*TODO: wrong hook */ +int notes_LoadMsgFromServer(SharedMessageStatus *Stat, + void **ViewSpecific, + message_summary* Msg, + int is_new, + int i) +{ struct vnote *v; WCTemplputParams TP; memset(&TP, 0, sizeof(WCTemplputParams)); TP.Filter.ContextType = CTX_VNOTE; - v = vnote_new_from_msg(Msg->msgnum, unread); + v = vnote_new_from_msg(Msg->msgnum, is_new); if (v) { TP.Context = v; DoTemplate(HKEY("vnoteitem"), @@ -304,6 +322,7 @@ void display_note(message_summary *Msg, int unread) { vnote_free(v); } + return 0; } @@ -326,7 +345,7 @@ void add_new_note(void) { vnote_free(v); } - readloop(readfwd); + readloop(readfwd, eUseDefault); } @@ -381,7 +400,7 @@ void tmpl_vcard_put_bgcolor(StrBuf *Target, WCTemplputParams *TP) void tmpl_vcard_put_message(StrBuf *Target, WCTemplputParams *TP) { struct vnote *v = (struct vnote *) CTX; - StrEscAppend(Target, NULL, v->body, 0, 0); ///TODO? + StrEscAppend(Target, NULL, v->body, 0, 0); /*TODO?*/ } void tmpl_vcard_put_uid(StrBuf *Target, WCTemplputParams *TP) @@ -390,21 +409,56 @@ void tmpl_vcard_put_uid(StrBuf *Target, WCTemplputParams *TP) StrBufAppendBufPlain(Target, v->uid, -1, 0); } + + + +int notes_GetParamsGetServerCall(SharedMessageStatus *Stat, + void **ViewSpecific, + long oper, + char *cmd, + long len, + char *filter, + long flen) +{ + strcpy(cmd, "MSGS ALL"); + Stat->maxmsgs = 32767; + wc_printf("
\n"); + return 200; + +} + +int notes_Cleanup(void **ViewSpecific) +{ + wDumpContent(1); + return 0; +} + + void InitModule_NOTES (void) { - WebcitAddUrlHandler(HKEY("add_new_note"), add_new_note, 0); - WebcitAddUrlHandler(HKEY("ajax_update_note"), ajax_update_note, 0); - - RegisterNamespace("VNOTE:POS:LEFT", 0, 0, tmpl_vcard_put_posleft, CTX_VNOTE); - RegisterNamespace("VNOTE:POS:TOP", 0, 0, tmpl_vcard_put_postop, CTX_VNOTE); - RegisterNamespace("VNOTE:POS:WIDTH", 0, 0, tmpl_vcard_put_poswidth, CTX_VNOTE); - RegisterNamespace("VNOTE:POS:HEIGHT", 0, 0, tmpl_vcard_put_posheight, CTX_VNOTE); - RegisterNamespace("VNOTE:POS:HEIGHT2", 0, 0, tmpl_vcard_put_posheight2, CTX_VNOTE); - RegisterNamespace("VNOTE:POS:WIDTH2", 0, 0, tmpl_vcard_put_width2, CTX_VNOTE); - RegisterNamespace("VNOTE:COLOR", 0, 0, tmpl_vcard_put_color, CTX_VNOTE); - RegisterNamespace("VNOTE:BGCOLOR", 0, 0,tmpl_vcard_put_bgcolor, CTX_VNOTE); - RegisterNamespace("VNOTE:MSG", 0, 1, tmpl_vcard_put_message, CTX_VNOTE); - RegisterNamespace("VNOTE:UID", 0, 0, tmpl_vcard_put_uid, CTX_VNOTE); + RegisterReadLoopHandlerset( + VIEW_NOTES, + notes_GetParamsGetServerCall, + NULL, + NULL, + NULL, + notes_LoadMsgFromServer, + NULL, + notes_Cleanup); + + WebcitAddUrlHandler(HKEY("add_new_note"), "", 0, add_new_note, 0); + WebcitAddUrlHandler(HKEY("ajax_update_note"), "", 0, ajax_update_note, 0); + + RegisterNamespace("VNOTE:POS:LEFT", 0, 0, tmpl_vcard_put_posleft, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:POS:TOP", 0, 0, tmpl_vcard_put_postop, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:POS:WIDTH", 0, 0, tmpl_vcard_put_poswidth, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:POS:HEIGHT", 0, 0, tmpl_vcard_put_posheight, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:POS:HEIGHT2", 0, 0, tmpl_vcard_put_posheight2, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:POS:WIDTH2", 0, 0, tmpl_vcard_put_width2, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:COLOR", 0, 0, tmpl_vcard_put_color, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:BGCOLOR", 0, 0,tmpl_vcard_put_bgcolor, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:MSG", 0, 1, tmpl_vcard_put_message, NULL, CTX_VNOTE); + RegisterNamespace("VNOTE:UID", 0, 0, tmpl_vcard_put_uid, NULL, CTX_VNOTE); }