X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fnotes.c;h=d9d0ebf65b4867dcf869f529bd618e241c2fc021;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=93dba977dcd67808d7e0e34fa850b9a40997ceac;hpb=1b44d5db01507d3aec88253fe96757c9dec25016;p=citadel.git diff --git a/webcit/notes.c b/webcit/notes.c index 93dba977d..d9d0ebf65 100644 --- a/webcit/notes.c +++ b/webcit/notes.c @@ -1,289 +1,199 @@ -/* - * $Id$ - * - */ #include "webcit.h" -#include "groupdav.h" +#include "dav.h" #include "webserver.h" - -/* - * Uncomment this #define in order to get the new vNote-based sticky notes view. - * We're keeping both versions here so that I can work on the new view without breaking - * the existing implementation prior to completion. - */ - -/* #define NEW_NOTES_VIEW */ +int pastel_palette[9][3] = { + { 0x80, 0x80, 0x80 }, + { 0xff, 0x80, 0x80 }, + { 0x80, 0x80, 0xff }, + { 0xff, 0xff, 0x80 }, + { 0x80, 0xff, 0x80 }, + { 0xff, 0x80, 0xff }, + { 0x80, 0xff, 0xff }, + { 0xff, 0x80, 0x80 }, + { 0x80, 0x80, 0x80 } +}; -#ifndef NEW_NOTES_VIEW /* - * display sticky notes - * - * msgnum = Message number on the local server of the note to be displayed + * Fetch a message from the server and extract a vNote from it */ -void display_note(long msgnum, int unread) +struct vnote *vnote_new_from_msg(long msgnum,int unread) { - char buf[SIZ]; - char notetext[SIZ]; - char display_notetext[SIZ]; - char eid[128]; - int in_text = 0; - int i, len; - - serv_printf("MSG0 %ld", msgnum); - serv_getln(buf, sizeof buf); - if (buf[0] != '1') { - wprintf("%s
\n", &buf[4]); - return; - } - - strcpy(notetext, ""); - strcpy(eid, ""); - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - - /* Fill the buffer */ - if ( (in_text) && (strlen(notetext) < SIZ-256) ) { - strcat(notetext, buf); - } - - if ( (!in_text) && (!strncasecmp(buf, "exti=", 5)) ) { - safestrncpy(eid, &buf[5], sizeof eid); - } - - if ( (!in_text) && (!strcasecmp(buf, "text")) ) { - in_text = 1; - } - } - - /* Now sanitize the buffer */ - len = strlen(notetext); - for (i=0; i\n"); - wprintf ("\n"); - } - else { - wprintf ("\n"); - wprintf ("\n"); - } - - if (!IsEmptyStr(eid)) { - wprintf("%s
\n", eid, display_notetext); - } - else { - wprintf("%s
\n", msgnum, display_notetext); - } - - /* Offer in-place editing. */ - if (!IsEmptyStr(eid)) { - wprintf("\n", - eid, - WC->nonce, - eid - ); - } -} -#endif - + StrBuf *Buf; + StrBuf *Data = NULL; + const char *bptr; + int Done = 0; + char uid_from_headers[256]; + char mime_partnum[256]; + char mime_filename[256]; + char mime_content_type[256]; + char mime_disposition[256]; + 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 */ -/* - * This gets called by the Ajax.InPlaceEditor when we save a note. - */ -void updatenote(void) -{ - char buf[SIZ]; - char notetext[SIZ]; - char display_notetext[SIZ]; - long msgnum; - int in_text = 0; - int i, len; - - serv_printf("ENT0 1||0|0||||||%s", bstr("eid")); - serv_getln(buf, sizeof buf); - if (buf[0] == '4') { - text_to_server(bstr("value")); - serv_puts("000"); + relevant_partnum[0] = '\0'; + serv_printf("MSG4 %ld", msgnum); /* we need the mime headers */ + Buf = NewStrBuf(); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) != 1) { + FreeStrBuf (&Buf); + return NULL; } - - begin_ajax_response(); - msgnum = locate_message_by_uid(bstr("eid")); - if (msgnum >= 0L) { - serv_printf("MSG0 %ld", msgnum); - serv_getln(buf, sizeof buf); - if (buf[0] == '1') { - strcpy(notetext, ""); - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - - /* Fill the buffer */ - if ( (in_text) && (strlen(notetext) < SIZ-256) ) { - strcat(notetext, buf); + while ((StrBuf_ServGetln(Buf)>=0) && !Done) { + if ( (StrLength(Buf)==3) && + !strcmp(ChrPtr(Buf), "000")) { + Done = 1; + break; + } + bptr = ChrPtr(Buf); + switch (phase) { + case 0: + if (!strncasecmp(bptr, "exti=", 5)) { + safestrncpy(uid_from_headers, &(ChrPtr(Buf)[5]), sizeof uid_from_headers); + } + else if (!strncasecmp(bptr, "part=", 5)) { + extract_token(mime_filename, &bptr[5], 1, '|', sizeof mime_filename); + 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); + + if (!strcasecmp(mime_content_type, "text/vnote")) { + strcpy(relevant_partnum, mime_partnum); + } + } + else if ((phase == 0) && (!strncasecmp(bptr, "text", 4))) { + phase = 1; + } + break; + case 1: + if (!IsEmptyStr(bptr)) { + if (!strncasecmp(bptr, "Content-type: ", 14)) { + safestrncpy(msg4_content_type, &bptr[14], sizeof msg4_content_type); + striplt(msg4_content_type); + } + else if (!strncasecmp(bptr, "Content-transfer-encoding: ", 27)) { + safestrncpy(msg4_content_encoding, &bptr[27], sizeof msg4_content_encoding); + striplt(msg4_content_type); } - - if ( (!in_text) && (!strcasecmp(buf, "text")) ) { - in_text = 1; + else if ((!strncasecmp(bptr, "Content-length: ", 16))) { + msg4_content_length = atoi(&bptr[16]); } + break; } - /* Now sanitize the buffer */ - len = strlen(notetext); - for (i=0; i 0) + && ( !strcasecmp(msg4_content_encoding, "7bit")) + && (!strcasecmp(msg4_content_type, "text/vnote")) + ) { + vnote_inline = 1; + } + } + case 2: + 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); + } + } + case 3: + if (vnote_inline) { + StrBufAppendBuf(Data, Buf, 0); } - - /* Make it HTML-happy and print it. */ - stresc(display_notetext, SIZ, notetext, 0, 0); - wprintf("%s\n", display_notetext); } } - else { - wprintf("%s", _("An error has occurred.")); - } - - end_ajax_response(); -} + FreeStrBuf(&Buf); + /* 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 ((!vnote_inline) && (!IsEmptyStr(relevant_partnum))) { + Data = load_mimepart(msgnum, relevant_partnum); + } - - - -/* - * Display a
containing a rendered sticky note. - */ -void display_vnote_div(struct vnote *v) { - - /* begin outer div */ - - wprintf("
uid); - wprintf("class=\"stickynote_outer\" "); - wprintf("style=\""); - wprintf("left: %dpx; ", v->pos_left); - wprintf("top: %dpx; ", v->pos_top); - wprintf("width: %dpx; ", v->pos_width); - wprintf("height: %dpx; ", v->pos_height); - wprintf("background-color: #%02X%02X%02X ", v->color_red, v->color_green, v->color_blue); - wprintf("\">"); - - /* begin title bar */ - - wprintf("
uid); - wprintf("class=\"stickynote_titlebar\" "); - wprintf("onMouseDown=\"NotesDragMouseDown(event,'%s')\" ", v->uid); - wprintf("style=\""); - wprintf("background-color: #%02X%02X%02X ", v->color_red/2, v->color_green/2, v->color_blue/2); - wprintf("\">"); - - wprintf(""); - wprintf(""); // nothing in the title bar, it's just for dragging - - wprintf("
"); - wprintf("
"); - - wprintf("
\n"); - - /* begin note body */ - - wprintf("
uid); - wprintf("class=\"stickynote_body\""); - wprintf(">"); - escputs(v->body); - wprintf("
\n"); - - wprintf("\n"); - - /* begin resize handle */ - - wprintf("
uid); - wprintf("class=\"stickynote_resize\" "); - wprintf("onMouseDown=\"NotesResizeMouseDown(event,'%s')\"", v->uid); - wprintf(">"); - - wprintf(""); - - wprintf("
\n"); - - /* end of note */ - - wprintf("
\n"); + 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]; + vnote_from_body->color_green = pastel_palette[3][1]; + vnote_from_body->color_blue = pastel_palette[3][2]; + 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 { + char *Buf = SmashStrBuf(&Data); + + struct vnote *v = vnote_new_from_str(Buf); + free(Buf); + return(v); + } + } + return NULL; } /* - * Fetch a message from the server and extract a vNote from it + * Serialize a vnote and write it to the server */ -struct vnote *vnote_new_from_msg(long msgnum) { +void write_vnote_to_server(struct vnote *v) +{ char buf[1024]; - char mime_partnum[256]; - char mime_filename[256]; - char mime_content_type[256]; - char mime_disposition[256]; - int mime_length; - char relevant_partnum[256]; - char *relevant_source = NULL; + 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 + ); - relevant_partnum[0] = '\0'; - sprintf(buf, "MSG4 %ld", msgnum); /* we need the mime headers */ - serv_puts(buf); + serv_puts("ENT0 1|||4"); serv_getln(buf, sizeof buf); - if (buf[0] != '1') return NULL; - - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - if (!strncasecmp(buf, "part=", 5)) { - extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename); - extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum); - extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition); - extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type); - mime_length = extract_int(&buf[5], 5); - - if (!strcasecmp(mime_content_type, "text/vnote")) { - strcpy(relevant_partnum, mime_partnum); - } - } + 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"); } +} - if (!IsEmptyStr(relevant_partnum)) { - relevant_source = load_mimepart(msgnum, relevant_partnum); - if (relevant_source != NULL) { - struct vnote *v = vnote_new_from_str(relevant_source); - free(relevant_source); - return(v); - } - } - return NULL; -} /* @@ -297,25 +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]); - v = vnote_new_from_msg(msgnum); + + /* 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(); + wc_printf("%s", buf); + end_ajax_response(); + return; + } + } + + /* 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 %ld\n", msgnum); + wc_printf("Cannot locate a vNote within message %d\n", msgnum); end_ajax_response(); return; } @@ -333,20 +256,22 @@ void ajax_update_note(void) { if (havebstr("width")) { v->pos_width = atoi(bstr("width")); } - if (havebstr("value")) { // I would have preferred 'body' but InPlaceEditor hardcodes 'value' + if (havebstr("red")) { + v->color_red = atoi(bstr("red")); + } + if (havebstr("green")) { + v->color_green = atoi(bstr("green")); + } + if (havebstr("blue")) { + v->color_blue = atoi(bstr("blue")); + } + if (havebstr("value")) { /* I would have preferred 'body' but InPlaceEditor hardcodes 'value' */ if (v->body) free(v->body); v->body = strdup(bstr("value")); } /* Serialize it and save it to the message base. Server will delete the old one. */ - serv_puts("ENT0 1|||4"); - serv_getln(buf, sizeof buf); - if (buf[0] == '4') { - serv_puts("Content-type: text/vnote"); - serv_puts(""); - serv_puts(vnote_serialize(v)); - serv_puts("000"); - } + write_vnote_to_server(v); begin_ajax_response(); if (v->body) { @@ -360,33 +285,180 @@ void ajax_update_note(void) { - - -#ifdef NEW_NOTES_VIEW - /* * display sticky notes * * msgnum = Message number on the local server of the note to be displayed */ -void display_note(long msgnum, 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; - v = vnote_new_from_msg(msgnum); + memset(&TP, 0, sizeof(WCTemplputParams)); + TP.Filter.ContextType = CTX_VNOTE; + v = vnote_new_from_msg(Msg->msgnum, is_new); if (v) { - display_vnote_div(v); + TP.Context = v; + DoTemplate(HKEY("vnoteitem"), + WC->WBuf, &TP); + /* uncomment these lines to see ugly debugging info - wprintf(""); + StrBufAppendPrintf(WC->trailing_javascript, + "document.write('L: ' + $('note-%s').style.left + '; ');", v->uid); + StrBufAppendPrintf(WC->trailing_javascript, + "document.write('T: ' + $('note-%s').style.top + '; ');", v->uid); + StrBufAppendPrintf(WC->trailing_javascript, + "document.write('W: ' + $('note-%s').style.width + '; ');", v->uid); + StrBufAppendPrintf(WC->trailing_javascript, + "document.write('H: ' + $('note-%s').style.height + '
');", v->uid); */ vnote_free(v); } + return 0; } -#endif + + +/* + * Create a new note + */ +void add_new_note(void) { + struct vnote *v; + + v = vnote_new(); + if (v) { + v->uid = malloc(128); + generate_uuid(v->uid); + v->color_red = pastel_palette[3][0]; + v->color_green = pastel_palette[3][1]; + v->color_blue = pastel_palette[3][2]; + v->body = strdup(_("Click on any note to edit it.")); + write_vnote_to_server(v); + vnote_free(v); + } + + readloop(readfwd, eUseDefault); +} + + +void tmpl_vcard_put_posleft(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%d", v->pos_left); +} + +void tmpl_vcard_put_postop(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%d", v->pos_top); +} + +void tmpl_vcard_put_poswidth(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%d", v->pos_width); +} + +void tmpl_vcard_put_posheight(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%d", v->pos_height); +} + +void tmpl_vcard_put_posheight2(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%d", (v->pos_height / 16) - 5); +} + +void tmpl_vcard_put_width2(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%d", (v->pos_width / 9) - 1); +} + +void tmpl_vcard_put_color(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%02X%02X%02X", v->color_red, v->color_green, v->color_blue); +} + +void tmpl_vcard_put_bgcolor(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrBufAppendPrintf(Target, "%02X%02X%02X", v->color_red/2, v->color_green/2, v->color_blue/2); +} + +void tmpl_vcard_put_message(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + StrEscAppend(Target, NULL, v->body, 0, 0); /*TODO?*/ +} + +void tmpl_vcard_put_uid(StrBuf *Target, WCTemplputParams *TP) +{ + struct vnote *v = (struct vnote *) CTX; + 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) +{ + 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); +}