]> code.citadel.org Git - citadel.git/blobdiff - webcit/notes.c
* use SmashStrBuf where apropriate
[citadel.git] / webcit / notes.c
index a4e570645317b8b03b816f076e8d7b9ebcaead3d..fe75c32b50da145ac2fe9cce759e6278e1d56a12 100644 (file)
@@ -20,134 +20,15 @@ int pastel_palette[9][3] = {
 };
 
 
-/*
- * Display a <div> containing a rendered sticky note.
- */
-void display_vnote_div(struct vnote *v) {
-       int i;
-
-
-       wprintf("<div id=\"note-%s\" ", v->uid);        /* begin outer div */
-       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("\">");
-
-
-
-
-
-       wprintf("<div id=\"titlebar-%s\" ", v->uid);    /* begin title bar div */
-       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("<table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%%><tr>");
-
-       wprintf("<td align=left valign=middle>");
-       wprintf("<img onclick=\"NotesClickPalette(event,'%s')\" ", v->uid);
-       wprintf("src=\"static/8paint16.gif\">");
-
-       wprintf("</td>");
-
-       wprintf("<td></td>");   // nothing in the title bar, it's just for dragging
-
-       wprintf("<td align=right valign=middle>");
-       wprintf("<img onclick=\"DeleteStickyNote(event,'%s','%s')\" ", v->uid, _("Delete this note?") );
-       wprintf("src=\"static/closewindow.gif\">");
-       wprintf("</td></tr></table>");
-
-       wprintf("</div>\n");                            // end title bar div
-
-
-
-
-
-       wprintf("<div id=\"notebody-%s\" ", v->uid);    // begin body div
-       wprintf("class=\"stickynote_body\"");
-       wprintf(">");
-       escputs(v->body);
-       wprintf("</div>\n");                            // end body div
-
-        StrBufAppendPrintf(WC->trailing_javascript,
-               " new Ajax.InPlaceEditor('notebody-%s', 'ajax_update_note?note_uid=%s', "
-               "{rows:%d,cols:%d,onEnterHover:false,onLeaveHover:false,"
-               "okText:'%s',cancelText:'%s',clickToEditText:'%s'});",
-               v->uid,
-               v->uid,
-               (v->pos_height / 16) - 5,
-               (v->pos_width / 9) - 1,
-               _("Save"),
-               _("Cancel"),
-               _("Click on any note to edit it.")
-       );
-
-       wprintf("<div id=\"resize-%s\" ", v->uid);      // begin resize handle div
-       wprintf("class=\"stickynote_resize\" ");
-       wprintf("onMouseDown=\"NotesResizeMouseDown(event,'%s')\"", v->uid);
-       wprintf("> </div>");                            // end resize handle div
-
-
-
-
-       /* embed color selector - it doesn't have to be inside the title bar html because
-        * it's a separate div placed by css
-        */
-       wprintf("<div id=\"palette-%s\" ", v->uid);     // begin stickynote_palette div
-       wprintf("class=\"stickynote_palette\">");
-
-       wprintf("<table border=0 cellpadding=0 cellspacing=0>");
-       for (i=0; i<9; ++i) {
-               if ((i%3)==0) wprintf("<tr>");
-               wprintf("<td ");
-               wprintf("onClick=\"NotesClickColor(event,'%s',%d,%d,%d,'#%02x%02x%02x','#%02x%02x%02x')\" ",
-                       v->uid,
-                       pastel_palette[i][0],           // color values to pass to ajax call
-                       pastel_palette[i][1],
-                       pastel_palette[i][2],
-                       pastel_palette[i][0],           // new color of note
-                       pastel_palette[i][1],
-                       pastel_palette[i][2],
-                       pastel_palette[i][0] / 2,       // new color of title bar
-                       pastel_palette[i][1] / 2,
-                       pastel_palette[i][2] / 2
-               );
-               wprintf("bgcolor=\"#%02x%02x%02x\"> </td>",
-                       pastel_palette[i][0],
-                       pastel_palette[i][1],
-                       pastel_palette[i][2]
-               );
-               if (((i+1)%3)==0) wprintf("</tr>");
-       }
-       wprintf("</table>");
-
-       wprintf("</div>");                              // end stickynote_palette div
-
-
-
-
-
-       wprintf("</div>\n");                            // end outer div
-}
-
-
-
 /*
  * Fetch a message from the server and extract a vNote from it
  */
 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];
@@ -160,16 +41,17 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
        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;
@@ -188,16 +70,10 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
                                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;
                        }
@@ -219,29 +95,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);
@@ -249,14 +125,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];
@@ -265,10 +140,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);
                }
        }
@@ -284,15 +163,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");
        }
 }
@@ -316,7 +218,6 @@ void ajax_update_note(void) {
                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') {
@@ -326,9 +227,8 @@ void ajax_update_note(void) {
                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);
@@ -340,7 +240,7 @@ void ajax_update_note(void) {
                }
        }
 
-       // 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();
@@ -371,7 +271,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"));
        }
@@ -396,15 +296,20 @@ 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: falscher 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) {
-//             display_vnote_div(v);
                TP.Context = v;
                DoTemplate(HKEY("vnoteitem"),
                           WC->WBuf, &TP);
@@ -423,6 +328,7 @@ void display_note(message_summary *Msg, int unread) {
 
                vnote_free(v);
        }
+       return 0;
 }
 
 
@@ -509,10 +415,41 @@ 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)
+{
+       strcpy(cmd, "MSGS ALL");
+       Stat->maxmsgs = 32767;
+       wprintf("<div id=\"new_notes_here\"></div>\n");
+       return 200;
+
+}
+
+int notes_Cleanup(void **ViewSpecific)
+{
+       end_burst();
+       return 0;
+}
+
+
 void 
 InitModule_NOTES
 (void)
 {
+       RegisterReadLoopHandlerset(
+               VIEW_NOTES,
+               notes_GetParamsGetServerCall,
+               NULL,
+               notes_LoadMsgFromServer,
+               NULL,
+               notes_Cleanup);
+
        WebcitAddUrlHandler(HKEY("add_new_note"), add_new_note, 0);
        WebcitAddUrlHandler(HKEY("ajax_update_note"), ajax_update_note, 0);